summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorroot <[email protected]>2024-10-08 11:10:03 +0000
committerroot <[email protected]>2024-10-08 11:10:03 +0000
commit35667246d3c23976e1200ee369683ea89ffbbaba (patch)
treec00a1869c2d8695475b595d0696ea3e9cebd92ef /test
parent3bbbd53f393927b2e1de784a70deee9d8694b195 (diff)
use attribute_name instead of attribute_id to map condition_id
Diffstat (limited to 'test')
-rw-r--r--test/json_update/corrupted.json4
-rw-r--r--test/json_update/new.json4
-rw-r--r--test/json_update/old.json2
-rw-r--r--test/maat_framework_gtest.cpp389
-rw-r--r--test/maat_json.json620
-rw-r--r--test/table_info.json2
-rw-r--r--test/test_utils.cpp39
7 files changed, 634 insertions, 426 deletions
diff --git a/test/json_update/corrupted.json b/test/json_update/corrupted.json
index 1359a01..81c9e9f 100644
--- a/test/json_update/corrupted.json
+++ b/test/json_update/corrupted.json
@@ -3,7 +3,7 @@
"object_table": "OBJECT",
"rules": [
{
- "rule_id": "9c5ee166-3af6-fb23-f8f8-8c7062ed3717",
+ "uuid": "9c5ee166-3af6-fb23-f8f8-8c7062ed3717",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -21,7 +21,7 @@
"table_name": "HTTP_URL",
"table_type": "expr",
"table_content": {
- "keywords": "hello&world",
+ "expression": "hello&world",
"expr_type": "none"
}
}
diff --git a/test/json_update/new.json b/test/json_update/new.json
index 6a2b523..268f24d 100644
--- a/test/json_update/new.json
+++ b/test/json_update/new.json
@@ -3,7 +3,7 @@
"object2object_table": "OBJECT2OBJECT",
"rules": [
{
- "rule_id": "9b0d44a1-1e9e-7988-6ab2-c619d5906818",
+ "uuid": "9b0d44a1-1e9e-7988-6ab2-c619d5906818",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -20,7 +20,7 @@
"table_name": "HTTP_URL",
"table_type": "expr",
"table_content": {
- "keywords": "MESA&Maat",
+ "expression": "MESA&Maat",
"expr_type": "and"
}
}
diff --git a/test/json_update/old.json b/test/json_update/old.json
index 7927caa..d26485d 100644
--- a/test/json_update/old.json
+++ b/test/json_update/old.json
@@ -20,7 +20,7 @@
"table_name": "HTTP_URL",
"table_type": "expr",
"table_content": {
- "keywords": "hello&world",
+ "expression": "hello&world",
"expr_type": "and"
}
}
diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp
index 7884d13..bcc7696 100644
--- a/test/maat_framework_gtest.cpp
+++ b/test/maat_framework_gtest.cpp
@@ -25,7 +25,7 @@ const char *g_json_filename = "maat_json.json";
size_t g_thread_num = 4;
-
+#if 0 //TODO
int test_add_expr_command(struct maat *maat_inst, const char *expr_table,
long long rule_id, int timeout,
const char *keywords)
@@ -57,6 +57,7 @@ int del_command(struct maat *maat_inst, int rule_id)
return rule_table_set_line(maat_inst, "RULE_DEFAULT", MAAT_OP_DEL,
rule_id, "null", 1, 0);
}
+#endif
const char *watched_json = "./json_update/maat.json";
const char *old_json = "./json_update/old.json";
@@ -432,7 +433,8 @@ TEST_F(FlagScan, hitRepeatedRule) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 194);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000194");
ret = maat_scan_not_logic(maat_inst, flag_table_name, flag_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -549,7 +551,9 @@ TEST_F(HsStringScan, Full) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -574,7 +578,9 @@ TEST_F(HsStringScan, Regex) {
ret = maat_scan_string(maat_inst, table_name, attribute_name, scan_data, strlen(scan_data),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 148);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000148");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -599,7 +605,9 @@ TEST_F(HsStringScan, RegexUnicode) {
ret = maat_scan_string(maat_inst, table_name, attribute_name, scan_data, strlen(scan_data),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 229);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000229");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -624,7 +632,9 @@ TEST_F(HsStringScan, BackslashR_N_Escape) {
ret = maat_scan_string(maat_inst, table_name, attribute_name, payload, strlen(payload),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 225);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000225");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -715,7 +725,9 @@ TEST_F(HsStringScan, BackslashCtrlCharactor)
ret = maat_scan_string(maat_inst, table_name, attribute_name, payload, strlen(payload),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 235);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000235");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -742,7 +754,9 @@ TEST_F(HsStringScan, Expr8) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 182);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000182");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -786,8 +800,11 @@ TEST_F(HsStringScan, HexBinCaseSensitive) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 206);
- EXPECT_EQ(results[1], 191);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000206");
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000191");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -824,7 +841,9 @@ TEST_F(HsStringScan, HexbinCombineString)
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 236);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000236");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -867,7 +886,9 @@ TEST_F(HsStringScan, BugReport20190325) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 150);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000150");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -905,8 +926,11 @@ TEST_F(HsStringScan, PrefixAndSuffix) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 151);
- EXPECT_EQ(results[1], 152);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000151");
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000152");
ret = maat_scan_not_logic(maat_inst, mail_addr_table_name, mail_addr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -918,7 +942,8 @@ TEST_F(HsStringScan, PrefixAndSuffix) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 151);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000151");
ret = maat_scan_not_logic(maat_inst, mail_addr_table_name, mail_addr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -936,7 +961,8 @@ TEST_F(HsStringScan, PrefixAndSuffix) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 152);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000152");
ret = maat_scan_not_logic(maat_inst, mail_addr_table_name, mail_addr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -962,7 +988,9 @@ TEST_F(HsStringScan, MaatUnescape) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 132);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000132");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1012,7 +1040,9 @@ TEST_F(HsStringScan, OffsetChunk64) {
}
}
EXPECT_EQ(pass_flag, 1);
- EXPECT_EQ(results[0], 136);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000136");
maat_stream_free(sp);
fclose(fp);
maat_state_free(state);
@@ -1059,7 +1089,9 @@ TEST_F(HsStringScan, OffsetChunk1460) {
}
}
EXPECT_EQ(pass_flag, 1);
- EXPECT_EQ(results[0], 136);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000136");
maat_stream_free(sp);
fclose(fp);
maat_state_free(state);
@@ -1103,7 +1135,9 @@ TEST_F(HsStringScan, StreamScanUTF8) {
}
EXPECT_EQ(pass_flag, 1);
- EXPECT_EQ(results[0], 157);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000157");
maat_stream_free(sp);
fclose(fp);
@@ -1142,7 +1176,9 @@ TEST_F(HsStringScan, StreamInput) {
maat_stream_free(sp);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 125);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1337,7 +1373,9 @@ TEST_F(RsStringScan, Full) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1363,7 +1401,9 @@ TEST_F(RsStringScan, Regex) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 148);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000148");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1388,7 +1428,9 @@ TEST_F(RsStringScan, RegexUnicode) {
ret = maat_scan_string(maat_inst, table_name, attribute_name, scan_data, strlen(scan_data),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 229);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000229");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1413,7 +1455,9 @@ TEST_F(RsStringScan, BackslashR_N_Escape) {
ret = maat_scan_string(maat_inst, table_name, attribute_name, payload, strlen(payload),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 225);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000225");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1504,7 +1548,9 @@ TEST_F(RsStringScan, BackslashCtrlCharactor)
ret = maat_scan_string(maat_inst, table_name, attribute_name, payload, strlen(payload),
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 235);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000235");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1530,7 +1576,9 @@ TEST_F(RsStringScan, Expr8) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 182);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000182");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1567,8 +1615,12 @@ TEST_F(RsStringScan, HexBinCaseSensitive) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 206);
- EXPECT_EQ(results[1], 191);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000206");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000191");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1606,7 +1658,9 @@ TEST_F(RsStringScan, HexbinCombineString)
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 236);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000236");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1649,7 +1703,9 @@ TEST_F(RsStringScan, BugReport20190325) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 150);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000150");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1687,8 +1743,12 @@ TEST_F(RsStringScan, PrefixAndSuffix) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 151);
- EXPECT_EQ(results[1], 152);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000151");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000152");
ret = maat_scan_not_logic(maat_inst, mail_addr_table_name, mail_addr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1700,7 +1760,8 @@ TEST_F(RsStringScan, PrefixAndSuffix) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 151);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000151");
ret = maat_scan_not_logic(maat_inst, mail_addr_table_name, mail_addr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1718,7 +1779,8 @@ TEST_F(RsStringScan, PrefixAndSuffix) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 152);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000152");
ret = maat_scan_not_logic(maat_inst, mail_addr_table_name, mail_addr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1744,7 +1806,9 @@ TEST_F(RsStringScan, MaatUnescape) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 132);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000132");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -1793,7 +1857,9 @@ TEST_F(RsStringScan, OffsetChunk64) {
}
}
EXPECT_EQ(pass_flag, 1);
- EXPECT_EQ(results[0], 136);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000136");
maat_stream_free(sp);
fclose(fp);
@@ -1841,7 +1907,9 @@ TEST_F(RsStringScan, OffsetChunk1460) {
}
EXPECT_EQ(pass_flag, 1);
- EXPECT_EQ(results[0], 136);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000136");
maat_stream_free(sp);
fclose(fp);
@@ -1888,7 +1956,9 @@ TEST_F(RsStringScan, StreamScanUTF8) {
}
EXPECT_EQ(pass_flag, 1);
- EXPECT_EQ(results[0], 157);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000157");
maat_stream_free(sp);
fclose(fp);
@@ -1926,7 +1996,9 @@ TEST_F(RsStringScan, StreamInput) {
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2386,7 +2458,9 @@ TEST_F(IPScan, MatchSingleIPv4) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 169);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000169");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2416,7 +2490,9 @@ TEST_F(IPScan, IPv6Unspecified) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 210);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000210");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2473,7 +2549,9 @@ TEST_F(IPScan, MatchSingleIPv6) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 210);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000210");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2503,8 +2581,12 @@ TEST_F(IPScan, MatchIPv4Range) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 208);
- EXPECT_EQ(results[1], 154);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000208");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000154");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2538,7 +2620,9 @@ TEST_F(IPScan, MatchIPv4Port) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 232);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000232");
maat_state_free(state);
state = NULL;
@@ -2563,8 +2647,12 @@ TEST_F(IPScan, MatchIPv6Range) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 210);
- EXPECT_EQ(results[1], 155);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000210");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000155");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2594,8 +2682,12 @@ TEST_F(IPScan, MatchIPv6Port) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 230);
- EXPECT_EQ(results[1], 210);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000230");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000210");
maat_state_reset(state);
//If the port is not present, should not match rules with port range. In this case, only rule 210 "::/0" should match.
@@ -2603,7 +2695,8 @@ TEST_F(IPScan, MatchIPv6Port) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 210);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000210");
maat_state_free(state);
state = NULL;
@@ -2823,7 +2916,9 @@ TEST_F(IntervalScan, SingleInteger) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 218);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000218");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -2894,7 +2989,9 @@ TEST_F(ObjectScan, PhysicalTable) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 226);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000226");
maat_state_free(state);
state = NULL;
@@ -2917,7 +3014,9 @@ TEST_F(ObjectScan, Attribute) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 233);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000233");
maat_state_free(state);
state = NULL;
@@ -2944,7 +3043,9 @@ TEST_F(ObjectScan, SetScanRuleTable) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 227);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000227");
maat_state_free(state);
state = NULL;
@@ -3019,7 +3120,9 @@ TEST_F(NOTLogic, OneRegion) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 143);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000143");
maat_state_reset(state);
@@ -3088,7 +3191,9 @@ TEST_F(NOTLogic, ScanNotAtLast) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 144);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000144");
maat_state_free(state);
state = NULL;
@@ -3125,7 +3230,9 @@ TEST_F(NOTLogic, ScanIrrelavantAtLast) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 144);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000144");
maat_state_free(state);
state = NULL;
@@ -3162,7 +3269,9 @@ TEST_F(NOTLogic, ScanHitAtLastEmptyExpr) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 186);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000186");
ret = maat_scan_not_logic(maat_inst, hit_table_name, hit_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -3211,7 +3320,9 @@ TEST_F(NOTLogic, ScanHitAtLastEmptyInteger) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 187);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000187");
ret = maat_scan_not_logic(maat_inst, hit_table_name, hit_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -3265,7 +3376,9 @@ TEST_F(NOTLogic, ScanNotIP) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 145);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000145");
maat_state_reset(state);
@@ -3374,7 +3487,9 @@ TEST_F(NOTLogic, NotUrlAndNotIp) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 146);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000146");
maat_state_free(state);
state = NULL;
@@ -3421,7 +3536,9 @@ TEST_F(NOTLogic, NotPhysicalTable) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 224);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000224");
maat_state_free(state);
state = NULL;
@@ -3516,7 +3633,9 @@ TEST_F(NOTLogic, EightNotCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 147);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000147");
maat_state_free(state);
state = NULL;
@@ -3564,7 +3683,9 @@ TEST_F(NOTLogic, NotConditionAndExcludeObject1) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 216);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000216");
maat_state_free(state);
state = NULL;
@@ -3620,7 +3741,9 @@ TEST_F(NOTLogic, NotConditionAndExcludeObject2) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 217);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000217");
maat_state_free(state);
state = NULL;
@@ -3658,7 +3781,9 @@ TEST_F(NOTLogic, SingleNotCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 222);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000222");
maat_state_free(state);
state = NULL;
@@ -3732,7 +3857,9 @@ TEST_F(NOTLogic, MultiNotConditions) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 223);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000223");
maat_state_free(state);
state = NULL;
@@ -3818,7 +3945,9 @@ TEST_F(NOTLogic, MultiObjectsInOneNotCondition) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 177);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000177");
maat_state_free(state);
state = NULL;
@@ -3873,7 +4002,9 @@ TEST_F(NOTLogic, MultiLiteralsInOneNotCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 181);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000181");
maat_state_reset(state);
@@ -3930,7 +4061,8 @@ TEST_F(NOTLogic, MultiLiteralsInOneNotCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 181);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000181");
maat_state_free(state);
state = NULL;
@@ -4037,7 +4169,9 @@ TEST_F(NOTLogic, SameAttributeInMultiCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 185);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000185");
maat_state_reset(state);
@@ -4134,7 +4268,9 @@ TEST_F(ExcludeLogic, ScanExcludeAtFirst) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 199);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000199");
ret = maat_scan_not_logic(maat_inst, hit_table_name, hit_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4173,7 +4309,9 @@ TEST_F(ExcludeLogic, ScanExcludeAtLast) {
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 200);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000200");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4201,7 +4339,9 @@ TEST_F(ExcludeLogic, ScanIrrelavantAtLast) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 200);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000200");
ret = maat_scan_not_logic(maat_inst, hit_table_name, hit_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4237,7 +4377,10 @@ TEST_F(ExcludeLogic, ScanAttribute) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 202);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000202");
+
maat_state_reset(state);
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
@@ -4249,7 +4392,8 @@ TEST_F(ExcludeLogic, ScanAttribute) {
ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 202);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000202");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4331,7 +4475,9 @@ TEST_F(ExcludeLogic, ScanWithMultiCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 203);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000203");
ret = maat_scan_not_logic(maat_inst, expr_table_name, expr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -4400,7 +4546,9 @@ TEST_F(ExcludeLogic, ExcludeInDifferentLevel) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 204);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000204");
ret = maat_scan_not_logic(maat_inst, expr_table_name, expr_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -5464,13 +5612,12 @@ TEST_F(RuleTable, RuleRuleUpdate) {
struct maat *maat_inst = RuleTable::_shared_maat_inst;
const char *rule_table_name = "RULE_DEFAULT";
- long long rule_id = maat_cmd_incrby(maat_inst, "TEST_SEQ", 1);
- int ret = rule_table_set_line(maat_inst, rule_table_name,
- MAAT_OP_ADD, rule_id, "null", 1, 0);
+ uuid_t rule_uuid;
+ uuid_generate(rule_uuid);
+ int ret = rule_table_set_line(maat_inst, rule_table_name, MAAT_OP_ADD, rule_uuid, "null", NULL, 0, 0);
EXPECT_EQ(ret, 1);
- ret = rule_table_set_line(maat_inst, rule_table_name,
- MAAT_OP_DEL, rule_id, "null", 1, 0);
+ ret = rule_table_set_line(maat_inst, rule_table_name, MAAT_OP_DEL, rule_uuid, "null", NULL, 0, 0);
EXPECT_EQ(ret, 1);
}
@@ -5489,8 +5636,12 @@ TEST_F(RuleTable, Conjunction1) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 197);
- EXPECT_EQ(results[1], 141);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000197");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000141");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -5519,8 +5670,12 @@ TEST_F(RuleTable, Conjunction2) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 197);
- EXPECT_EQ(results[1], 141);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000197");
+
+ uuid_unparse(results[1], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000141");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -5703,7 +5858,9 @@ TEST_F(Policy, RuleEXData) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 198);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000198");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -5750,7 +5907,9 @@ TEST_F(Policy, SubObject) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
- EXPECT_EQ(results[0], 153);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000153");
ret = maat_scan_not_logic(maat_inst, ip_table_name, ip_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -5979,8 +6138,12 @@ TEST_F(TableInfo, Conjunction) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 2);
- EXPECT_EQ(results[0], 134);
- EXPECT_EQ(results[1], 133);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000134");
+
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000133");
ret = maat_scan_not_logic(maat_inst, conj_table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -6159,7 +6322,9 @@ TEST_F(ObjectHierarchy, AttributeOfOnePhysical)
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 160);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000160");
ret = maat_scan_not_logic(maat_inst, keywords_table_name, keywords_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -6209,7 +6374,9 @@ TEST_F(ObjectHierarchy, OneObjectInTwoAttribute) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 163);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000163");
ret = maat_scan_not_logic(maat_inst, table_name, res_attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -6248,7 +6415,9 @@ TEST_F(ObjectHierarchy, MultiObjectsInOneCondition) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 178);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000178");
ret = maat_scan_not_logic(maat_inst, table_name, dst_asn_sttribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -6271,7 +6440,8 @@ TEST_F(ObjectHierarchy, MultiObjectsInOneCondition) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 178);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000178");
ret = maat_scan_not_logic(maat_inst, table_name, dst_asn_sttribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -6294,7 +6464,8 @@ TEST_F(ObjectHierarchy, MultiObjectsInOneCondition) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 178);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000178");
ret = maat_scan_not_logic(maat_inst, table_name, dst_asn_sttribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -6335,7 +6506,9 @@ TEST_F(ObjectHierarchy, MultiLiteralsInOneCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 180);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000180");
maat_state_reset(state);
@@ -6350,7 +6523,8 @@ TEST_F(ObjectHierarchy, MultiLiteralsInOneCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 180);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000180");
maat_state_reset(state);
@@ -6369,7 +6543,8 @@ TEST_F(ObjectHierarchy, MultiLiteralsInOneCondition) {
&n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 180);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000180");
maat_state_free(state);
state = NULL;
@@ -10430,7 +10605,9 @@ TEST_F(MaatRollback, FullConfigRollback) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -10461,7 +10638,8 @@ TEST_F(MaatRollback, FullConfigRollback) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -10488,7 +10666,9 @@ TEST_F(MaatRollback, FullConfigRollbackWhenScanUnfinished) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ char uuid_str[UUID_STR_LEN] = {0};
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
@@ -10519,7 +10699,8 @@ TEST_F(MaatRollback, FullConfigRollbackWhenScanUnfinished) {
results, ARRAY_SIZE, &n_hit_result, state);
EXPECT_EQ(ret, MAAT_SCAN_HIT);
EXPECT_EQ(n_hit_result, 1);
- EXPECT_EQ(results[0], 125);
+ uuid_unparse(results[0], uuid_str);
+ EXPECT_STREQ(uuid_str, "00000000-0000-0000-0000-000000000125");
ret = maat_scan_not_logic(maat_inst, table_name, attribute_name, results, ARRAY_SIZE,
&n_hit_result, state);
diff --git a/test/maat_json.json b/test/maat_json.json
index 887dd9c..1e8adba 100644
--- a/test/maat_json.json
+++ b/test/maat_json.json
@@ -4,7 +4,7 @@
"objects": [
{
"object_name": "ASN1234",
- "object_id": "00000000-0000-0000-0000-000000000001",
+ "uuid": "00000000-0000-0000-0000-000000000001",
"items": [
{
"table_name": "AS_NUMBER",
@@ -18,7 +18,7 @@
},
{
"object_name": "ASN2345",
- "object_id": "00000000-0000-0000-0000-000000000002",
+ "uuid": "00000000-0000-0000-0000-000000000002",
"items": [
{
"table_name": "AS_NUMBER",
@@ -32,7 +32,7 @@
},
{
"object_name": "ASN6789",
- "object_id": "00000000-0000-0000-0000-000000000003",
+ "uuid": "00000000-0000-0000-0000-000000000003",
"items": [
{
"table_name": "AS_NUMBER",
@@ -46,7 +46,7 @@
},
{
"object_name": "ASN9001",
- "object_id": "00000000-0000-0000-0000-000000000004",
+ "uuid": "00000000-0000-0000-0000-000000000004",
"items": [
{
"table_name": "AS_NUMBER",
@@ -60,7 +60,7 @@
},
{
"object_name": "ASN9002",
- "object_id": "00000000-0000-0000-0000-000000000005",
+ "uuid": "00000000-0000-0000-0000-000000000005",
"items": [
{
"table_name": "AS_NUMBER",
@@ -74,7 +74,7 @@
},
{
"object_name": "ASN9003",
- "object_id": "00000000-0000-0000-0000-000000000006",
+ "uuid": "00000000-0000-0000-0000-000000000006",
"items": [
{
"table_name": "AS_NUMBER",
@@ -88,7 +88,7 @@
},
{
"object_name": "IPv4-composition-source-only",
- "object_id": "00000000-0000-0000-0000-000000000007",
+ "uuid": "00000000-0000-0000-0000-000000000007",
"items": [
{
"table_type": "ip",
@@ -101,7 +101,7 @@
},
{
"object_name": "FQDN_OBJ1",
- "object_id": "00000000-0000-0000-0000-000000000008",
+ "uuid": "00000000-0000-0000-0000-000000000008",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -115,7 +115,7 @@
},
{
"object_name": "FQDN_CAT1",
- "object_id": "00000000-0000-0000-0000-000000000009",
+ "uuid": "00000000-0000-0000-0000-000000000009",
"items": [
{
"table_name": "INTERGER_PLUS",
@@ -129,7 +129,7 @@
},
{
"object_name": "IPv4-composition-NOT-client-ip",
- "object_id": "00000000-0000-0000-0000-000000000010",
+ "uuid": "00000000-0000-0000-0000-000000000010",
"items": [
{
"table_type": "ip",
@@ -142,7 +142,7 @@
},
{
"object_name": "IPv4-composition-NOT-server-ip",
- "object_id": "00000000-0000-0000-0000-000000000011",
+ "uuid": "00000000-0000-0000-0000-000000000011",
"items": [
{
"table_type": "ip",
@@ -155,7 +155,7 @@
},
{
"object_name": "financial-department-ip",
- "object_id": "00000000-0000-0000-0000-000000000012",
+ "uuid": "00000000-0000-0000-0000-000000000012",
"items": [
{
"table_name": "IP_CONFIG",
@@ -168,7 +168,7 @@
},
{
"object_name": "security-department-ip",
- "object_id": "00000000-0000-0000-0000-000000000013",
+ "uuid": "00000000-0000-0000-0000-000000000013",
"items": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -181,7 +181,7 @@
},
{
"object_name": "develop-department-ip",
- "object_id": "00000000-0000-0000-0000-000000000014",
+ "uuid": "00000000-0000-0000-0000-000000000014",
"items": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -194,7 +194,7 @@
},
{
"object_name": "Country-Sparta-IP",
- "object_id": "00000000-0000-0000-0000-000000000015",
+ "uuid": "00000000-0000-0000-0000-000000000015",
"items": [
{
"table_name": "GeoLocation",
@@ -208,7 +208,7 @@
},
{
"object_name": "123_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000100",
+ "uuid": "00000000-0000-0000-0000-000000000100",
"items": [
{
"table_name": "IP_CONFIG",
@@ -228,7 +228,7 @@
},
{
"object_name": "126_interval_object",
- "object_id": "00000000-0000-0000-0000-000000000106",
+ "uuid": "00000000-0000-0000-0000-000000000106",
"items": [
{
"table_name": "CONTENT_SIZE",
@@ -241,7 +241,7 @@
},
{
"object_name": "TakeMeHome",
- "object_id": "00000000-0000-0000-0000-000000000111",
+ "uuid": "00000000-0000-0000-0000-000000000111",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -255,7 +255,7 @@
},
{
"object_name": "152_mail_addr",
- "object_id": "00000000-0000-0000-0000-000000000141",
+ "uuid": "00000000-0000-0000-0000-000000000141",
"items": [
{
"table_type": "expr",
@@ -277,7 +277,7 @@
},
{
"object_name": "153_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000143",
+ "uuid": "00000000-0000-0000-0000-000000000143",
"items": [
{
"table_type": "expr",
@@ -291,7 +291,7 @@
},
{
"object_name": "vt_grp_http_sig1",
- "object_id": "00000000-0000-0000-0000-000000000152",
+ "uuid": "00000000-0000-0000-0000-000000000152",
"items": [
{
"table_name": "HTTP_SIGNATURE",
@@ -306,7 +306,7 @@
},
{
"object_name": "vt_grp_http_sig2",
- "object_id": "00000000-0000-0000-0000-000000000153",
+ "uuid": "00000000-0000-0000-0000-000000000153",
"items": [
{
"table_name": "HTTP_SIGNATURE",
@@ -330,7 +330,7 @@
},
{
"object_name": "167_url_object",
- "object_id": "00000000-0000-0000-0000-000000000158",
+ "uuid": "00000000-0000-0000-0000-000000000158",
"items": [
{
"table_name": "HTTP_URL",
@@ -344,7 +344,7 @@
},
{
"object_name": "ExcludeLogicObject199_1",
- "object_id": "00000000-0000-0000-0000-000000000189",
+ "uuid": "00000000-0000-0000-0000-000000000189",
"is_exclude": 0,
"items": [
{
@@ -359,7 +359,7 @@
},
{
"object_name": "ExcludeLogicObject199_2",
- "object_id": "00000000-0000-0000-0000-000000000190",
+ "uuid": "00000000-0000-0000-0000-000000000190",
"is_exclude": 1,
"items": [
{
@@ -374,7 +374,7 @@
},
{
"object_name": "ExcludeLogicObject200_1",
- "object_id": "00000000-0000-0000-0000-000000000192",
+ "uuid": "00000000-0000-0000-0000-000000000192",
"is_exclude": 0,
"items": [
{
@@ -389,7 +389,7 @@
},
{
"object_name": "ExcludeLogicObject200_2",
- "object_id": "00000000-0000-0000-0000-000000000193",
+ "uuid": "00000000-0000-0000-0000-000000000193",
"is_exclude": 1,
"items": [
{
@@ -404,7 +404,7 @@
},
{
"object_name": "ExcludeLogicObject202_1",
- "object_id": "00000000-0000-0000-0000-000000000195",
+ "uuid": "00000000-0000-0000-0000-000000000195",
"is_exclude": 0,
"items": [
{
@@ -418,7 +418,7 @@
},
{
"object_name": "ExcludeLogicObject202_2",
- "object_id": "00000000-0000-0000-0000-000000000196",
+ "uuid": "00000000-0000-0000-0000-000000000196",
"is_exclude": 1,
"items": [
{
@@ -432,7 +432,7 @@
},
{
"object_name": "ExcludeLogicObject202_3",
- "object_id": "00000000-0000-0000-0000-000000000197",
+ "uuid": "00000000-0000-0000-0000-000000000197",
"is_exclude": 1,
"items": [
{
@@ -446,7 +446,7 @@
},
{
"object_name": "ExcludeLogicObject203_3_1",
- "object_id": "00000000-0000-0000-0000-000000000201",
+ "uuid": "00000000-0000-0000-0000-000000000201",
"is_exclude": 0,
"items": [
{
@@ -461,7 +461,7 @@
},
{
"object_name": "ExcludeLogicObject203_3_2",
- "object_id": "00000000-0000-0000-0000-000000000202",
+ "uuid": "00000000-0000-0000-0000-000000000202",
"is_exclude": 1,
"items": [
{
@@ -476,7 +476,7 @@
},
{
"object_name": "ExcludeLogicObject204_3_1_1",
- "object_id": "00000000-0000-0000-0000-000000000207",
+ "uuid": "00000000-0000-0000-0000-000000000207",
"is_exclude": 0,
"items": [
{
@@ -491,7 +491,7 @@
},
{
"object_name": "ExcludeLogicObject204_3_1_2",
- "object_id": "00000000-0000-0000-0000-000000000208",
+ "uuid": "00000000-0000-0000-0000-000000000208",
"is_exclude": 1,
"items": [
{
@@ -506,7 +506,7 @@
},
{
"object_name": "ExcludeLogicObject204_3_2",
- "object_id": "00000000-0000-0000-0000-000000000209",
+ "uuid": "00000000-0000-0000-0000-000000000209",
"is_exclude": 1,
"items": [
{
@@ -521,7 +521,7 @@
},
{
"object_name": "ExcludeLogicObject217_1_1",
- "object_id": "00000000-0000-0000-0000-000000000223",
+ "uuid": "00000000-0000-0000-0000-000000000223",
"is_exclude": 0,
"items": [
{
@@ -536,7 +536,7 @@
},
{
"object_name": "ExcludeLogicObject217_1_2",
- "object_id": "00000000-0000-0000-0000-000000000224",
+ "uuid": "00000000-0000-0000-0000-000000000224",
"is_exclude": 1,
"items": [
{
@@ -552,93 +552,93 @@
],
"object_groups": [
{
- "object_id": "00000000-0000-0000-0000-000000000500",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000500",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000106"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000501",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000501",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000141"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000502",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000502",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000100"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000503",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000503",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000189"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000190"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000504",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000504",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000192"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000193"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000505",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000505",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000195"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000196",
"00000000-0000-0000-0000-000000000197"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000506",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000506",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000201"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000202"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000507",
+ "uuid": "00000000-0000-0000-0000-000000000507",
"object_name": "ExcludeLogicObject204_3_1",
- "include_object_ids": [
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000207"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000208"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000508",
+ "uuid": "00000000-0000-0000-0000-000000000508",
"object_name": "ExcludeLogicObject204_3",
- "include_object_ids": [
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000507"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000209"
]
},
{
- "object_id": "00000000-0000-0000-0000-000000000509",
- "include_object_ids": [
+ "uuid": "00000000-0000-0000-0000-000000000509",
+ "include_object_uuids": [
"00000000-0000-0000-0000-000000000223"
],
- "exclude_object_ids": [
+ "exclude_object_uuids": [
"00000000-0000-0000-0000-000000000224"
]
}
],
"rules": [
{
- "rule_id": "00000000-0000-0000-0000-000000000123",
+ "uuid": "00000000-0000-0000-0000-000000000123",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -648,7 +648,7 @@
"conditions": [
{
"attribute": "IP_CONFIG",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000100"
]
},
@@ -657,7 +657,7 @@
"objects": [
{
"object_name": "123_url_object",
- "object_id": "00000000-0000-0000-0000-000000000101",
+ "uuid": "00000000-0000-0000-0000-000000000101",
"items": [
{
"table_name": "HTTP_URL",
@@ -674,7 +674,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000124",
+ "uuid": "00000000-0000-0000-0000-000000000124",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -684,7 +684,7 @@
"conditions": [
{
"attribute": "IP_CONFIG",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000100"
]
},
@@ -693,7 +693,7 @@
"objects": [
{
"object_name": "124_interval_object",
- "object_id": "00000000-0000-0000-0000-000000000102",
+ "uuid": "00000000-0000-0000-0000-000000000102",
"items": [
{
"table_name": "CONTENT_SIZE",
@@ -709,7 +709,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000125",
+ "uuid": "00000000-0000-0000-0000-000000000125",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -722,7 +722,7 @@
"objects": [
{
"object_name": "125_url_object",
- "object_id": "00000000-0000-0000-0000-000000000103",
+ "uuid": "00000000-0000-0000-0000-000000000103",
"items": [
{
"table_name": "HTTP_URL",
@@ -739,7 +739,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000126",
+ "uuid": "00000000-0000-0000-0000-000000000126",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -752,7 +752,7 @@
"objects": [
{
"object_name": "126_url_object",
- "object_id": "00000000-0000-0000-0000-000000000105",
+ "uuid": "00000000-0000-0000-0000-000000000105",
"items": [
{
"table_name": "HTTP_URL",
@@ -768,14 +768,14 @@
},
{
"attribute": "CONTENT_SIZE",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000106"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000128",
+ "uuid": "00000000-0000-0000-0000-000000000128",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -788,7 +788,7 @@
"objects": [
{
"object_name": "128_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000107",
+ "uuid": "00000000-0000-0000-0000-000000000107",
"items": [
{
"table_name": "HTTP_SIGNATURE",
@@ -806,7 +806,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000129",
+ "uuid": "00000000-0000-0000-0000-000000000129",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -819,7 +819,7 @@
"objects": [
{
"object_name": "129_url_object",
- "object_id": "00000000-0000-0000-0000-000000000108",
+ "uuid": "00000000-0000-0000-0000-000000000108",
"items": [
{
"table_name": "HTTP_URL",
@@ -836,7 +836,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000130",
+ "uuid": "00000000-0000-0000-0000-000000000130",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -849,7 +849,7 @@
"objects": [
{
"object_name": "130_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000109",
+ "uuid": "00000000-0000-0000-0000-000000000109",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -866,7 +866,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000131",
+ "uuid": "00000000-0000-0000-0000-000000000131",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -879,7 +879,7 @@
"objects": [
{
"object_name": "131_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000110",
+ "uuid": "00000000-0000-0000-0000-000000000110",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -896,7 +896,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000132",
+ "uuid": "00000000-0000-0000-0000-000000000132",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -906,14 +906,14 @@
"conditions": [
{
"attribute": "KEYWORDS_TABLE",
- "object_ids":[
+ "object_uuids":[
"00000000-0000-0000-0000-000000000111"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000133",
+ "uuid": "00000000-0000-0000-0000-000000000133",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -926,7 +926,7 @@
"objects": [
{
"object_name": "133_host_object",
- "object_id": "00000000-0000-0000-0000-000000000112",
+ "uuid": "00000000-0000-0000-0000-000000000112",
"items": [
{
"table_name": "HTTP_HOST",
@@ -943,7 +943,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000134",
+ "uuid": "00000000-0000-0000-0000-000000000134",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -956,7 +956,7 @@
"objects": [
{
"object_name": "134_url_object",
- "object_id": "00000000-0000-0000-0000-000000000113",
+ "uuid": "00000000-0000-0000-0000-000000000113",
"items": [
{
"table_name": "HTTP_URL",
@@ -973,7 +973,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000136",
+ "uuid": "00000000-0000-0000-0000-000000000136",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -986,7 +986,7 @@
"objects": [
{
"object_name": "136_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000114",
+ "uuid": "00000000-0000-0000-0000-000000000114",
"items": [
{
"table_name": "IMAGE_FP",
@@ -1003,7 +1003,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000137",
+ "uuid": "00000000-0000-0000-0000-000000000137",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1016,7 +1016,7 @@
"objects": [
{
"object_name": "137_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000115",
+ "uuid": "00000000-0000-0000-0000-000000000115",
"items": [
{
"table_name": "IMAGE_FP",
@@ -1033,7 +1033,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000138",
+ "uuid": "00000000-0000-0000-0000-000000000138",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1048,7 +1048,7 @@
"objects": [
{
"object_name": "138_url_object",
- "object_id": "00000000-0000-0000-0000-000000000116",
+ "uuid": "00000000-0000-0000-0000-000000000116",
"items": [
{
"table_name": "HTTP_URL",
@@ -1065,7 +1065,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000139",
+ "uuid": "00000000-0000-0000-0000-000000000139",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1080,7 +1080,7 @@
"objects": [
{
"object_name": "139_url_object",
- "object_id": "00000000-0000-0000-0000-000000000117",
+ "uuid": "00000000-0000-0000-0000-000000000117",
"items": [
{
"table_name": "HTTP_URL",
@@ -1097,7 +1097,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000140",
+ "uuid": "00000000-0000-0000-0000-000000000140",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1110,7 +1110,7 @@
"objects": [
{
"object_name": "140_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000118",
+ "uuid": "00000000-0000-0000-0000-000000000118",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1127,7 +1127,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000141",
+ "uuid": "00000000-0000-0000-0000-000000000141",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1142,7 +1142,7 @@
"objects": [
{
"object_name": "141_url_object",
- "object_id": "00000000-0000-0000-0000-000000000119",
+ "uuid": "00000000-0000-0000-0000-000000000119",
"items": [
{
"table_name": "HTTP_URL",
@@ -1159,7 +1159,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000142",
+ "uuid": "00000000-0000-0000-0000-000000000142",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1172,7 +1172,7 @@
"objects": [
{
"object_name": "142_url_object",
- "object_id": "00000000-0000-0000-0000-000000000120",
+ "uuid": "00000000-0000-0000-0000-000000000120",
"items": [
{
"table_name": "HTTP_URL",
@@ -1189,7 +1189,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000143",
+ "uuid": "00000000-0000-0000-0000-000000000143",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1203,7 +1203,7 @@
"objects": [
{
"object_name": "143_url_object1",
- "object_id": "00000000-0000-0000-0000-000000000121",
+ "uuid": "00000000-0000-0000-0000-000000000121",
"items": [
{
"table_name": "HTTP_URL",
@@ -1223,7 +1223,7 @@
"objects": [
{
"object_name": "143_url_object2",
- "object_id": "00000000-0000-0000-0000-000000000122",
+ "uuid": "00000000-0000-0000-0000-000000000122",
"items": [
{
"table_name": "HTTP_URL",
@@ -1240,7 +1240,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000144",
+ "uuid": "00000000-0000-0000-0000-000000000144",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1254,7 +1254,7 @@
"objects": [
{
"object_name": "144_url_object",
- "object_id": "00000000-0000-0000-0000-000000000123",
+ "uuid": "00000000-0000-0000-0000-000000000123",
"items": [
{
"table_name": "HTTP_URL",
@@ -1274,7 +1274,7 @@
"objects": [
{
"object_name": "144_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000124",
+ "uuid": "00000000-0000-0000-0000-000000000124",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1291,7 +1291,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000145",
+ "uuid": "00000000-0000-0000-0000-000000000145",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1305,7 +1305,7 @@
"objects": [
{
"object_name": "145_url_object",
- "object_id": "00000000-0000-0000-0000-000000000125",
+ "uuid": "00000000-0000-0000-0000-000000000125",
"items": [
{
"table_name": "HTTP_URL",
@@ -1322,14 +1322,14 @@
{
"attribute": "ATTRIBUTE_IP_CONFIG",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000100"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000146",
+ "uuid": "00000000-0000-0000-0000-000000000146",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1344,7 +1344,7 @@
"objects": [
{
"object_name": "146_url_object",
- "object_id": "00000000-0000-0000-0000-000000000126",
+ "uuid": "00000000-0000-0000-0000-000000000126",
"items": [
{
"table_name": "HTTP_URL",
@@ -1365,7 +1365,7 @@
"objects": [
{
"object_name": "146_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000127",
+ "uuid": "00000000-0000-0000-0000-000000000127",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1383,14 +1383,14 @@
"attribute": "ATTRIBUTE_IP_CONFIG",
"negate_option": 1,
"condition_index": 2,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000100"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000147",
+ "uuid": "00000000-0000-0000-0000-000000000147",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1405,7 +1405,7 @@
"objects": [
{
"object_name": "147_keywords_object1",
- "object_id": "00000000-0000-0000-0000-000000000128",
+ "uuid": "00000000-0000-0000-0000-000000000128",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1426,7 +1426,7 @@
"objects": [
{
"object_name": "147_keywords_object2",
- "object_id": "00000000-0000-0000-0000-000000000129",
+ "uuid": "00000000-0000-0000-0000-000000000129",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1447,7 +1447,7 @@
"objects": [
{
"object_name": "147_keywords_object3",
- "object_id": "00000000-0000-0000-0000-000000000130",
+ "uuid": "00000000-0000-0000-0000-000000000130",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1468,7 +1468,7 @@
"objects": [
{
"object_name": "147_keywords_object4",
- "object_id": "00000000-0000-0000-0000-000000000131",
+ "uuid": "00000000-0000-0000-0000-000000000131",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1489,7 +1489,7 @@
"objects": [
{
"object_name": "147_keywords_object5",
- "object_id": "00000000-0000-0000-0000-000000000132",
+ "uuid": "00000000-0000-0000-0000-000000000132",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1510,7 +1510,7 @@
"objects": [
{
"object_name": "147_keywords_object6",
- "object_id": "00000000-0000-0000-0000-000000000133",
+ "uuid": "00000000-0000-0000-0000-000000000133",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1531,7 +1531,7 @@
"objects": [
{
"object_name": "147_keywords_object7",
- "object_id": "00000000-0000-0000-0000-000000000134",
+ "uuid": "00000000-0000-0000-0000-000000000134",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1552,7 +1552,7 @@
"objects": [
{
"object_name": "147_keywords_object8",
- "object_id": "00000000-0000-0000-0000-000000000135",
+ "uuid": "00000000-0000-0000-0000-000000000135",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1569,7 +1569,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000148",
+ "uuid": "00000000-0000-0000-0000-000000000148",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1582,7 +1582,7 @@
"objects": [
{
"object_name": "148_url_object",
- "object_id": "00000000-0000-0000-0000-000000000136",
+ "uuid": "00000000-0000-0000-0000-000000000136",
"items": [
{
"table_name": "HTTP_URL",
@@ -1599,7 +1599,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000150",
+ "uuid": "00000000-0000-0000-0000-000000000150",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1612,7 +1612,7 @@
"objects": [
{
"object_name": "billgates_regist1",
- "object_id": "00000000-0000-0000-0000-000000000138",
+ "uuid": "00000000-0000-0000-0000-000000000138",
"items": [
{
"table_type": "expr",
@@ -1631,7 +1631,7 @@
"objects": [
{
"object_name": "billgates_regist2",
- "object_id": "00000000-0000-0000-0000-000000000139",
+ "uuid": "00000000-0000-0000-0000-000000000139",
"items": [
{
"table_type": "expr",
@@ -1648,7 +1648,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000151",
+ "uuid": "00000000-0000-0000-0000-000000000151",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1661,7 +1661,7 @@
"objects": [
{
"object_name": "151_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000140",
+ "uuid": "00000000-0000-0000-0000-000000000140",
"items": [
{
"table_type": "expr",
@@ -1678,7 +1678,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000152",
+ "uuid": "00000000-0000-0000-0000-000000000152",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1688,20 +1688,20 @@
"conditions": [
{
"attribute": "MAIL_ADDR",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000141"
]
},
{
"attribute": "CONTENT_SIZE",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000500"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000153",
+ "uuid": "00000000-0000-0000-0000-000000000153",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1712,21 +1712,21 @@
{
"attribute": "MAIL_ADDR",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000143",
"00000000-0000-0000-0000-000000000501"
]
},
{
"attribute": "IP_CONFIG",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000502"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000154",
+ "uuid": "00000000-0000-0000-0000-000000000154",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1740,7 +1740,7 @@
"objects": [
{
"object_name": "154_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000145",
+ "uuid": "00000000-0000-0000-0000-000000000145",
"items": [
{
"table_type": "ip",
@@ -1756,7 +1756,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000155",
+ "uuid": "00000000-0000-0000-0000-000000000155",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1770,7 +1770,7 @@
"objects": [
{
"object_name": "155_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000146",
+ "uuid": "00000000-0000-0000-0000-000000000146",
"items": [
{
"table_type": "ip",
@@ -1786,7 +1786,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000157",
+ "uuid": "00000000-0000-0000-0000-000000000157",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1799,7 +1799,7 @@
"objects": [
{
"object_name": "157_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000148",
+ "uuid": "00000000-0000-0000-0000-000000000148",
"items": [
{
"table_type": "expr",
@@ -1816,7 +1816,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000158",
+ "uuid": "00000000-0000-0000-0000-000000000158",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1829,7 +1829,7 @@
"objects": [
{
"object_name": "158_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000149",
+ "uuid": "00000000-0000-0000-0000-000000000149",
"items": [
{
"table_type": "ip",
@@ -1845,7 +1845,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000159",
+ "uuid": "00000000-0000-0000-0000-000000000159",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1858,7 +1858,7 @@
"objects": [
{
"object_name": "159_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000150",
+ "uuid": "00000000-0000-0000-0000-000000000150",
"items": [
{
"table_type": "ip",
@@ -1874,7 +1874,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000160",
+ "uuid": "00000000-0000-0000-0000-000000000160",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1885,7 +1885,7 @@
{
"attribute": "HTTP_RESPONSE_KEYWORDS",
"negate_option": 0,
- "object_ids":[
+ "object_uuids":[
"00000000-0000-0000-0000-000000000111"
]
},
@@ -1895,7 +1895,7 @@
"objects": [
{
"object_name": "160_url_object",
- "object_id": "00000000-0000-0000-0000-000000000151",
+ "uuid": "00000000-0000-0000-0000-000000000151",
"items": [
{
"table_name": "HTTP_URL",
@@ -1912,7 +1912,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000163",
+ "uuid": "00000000-0000-0000-0000-000000000163",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -1923,21 +1923,21 @@
{
"attribute": "HTTP_REQUEST_HEADER",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000153"
]
},
{
"attribute": "HTTP_RESPONSE_HEADER",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000153"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000164",
+ "uuid": "00000000-0000-0000-0000-000000000164",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1950,7 +1950,7 @@
"objects": [
{
"object_name": "164_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000154",
+ "uuid": "00000000-0000-0000-0000-000000000154",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -1967,7 +1967,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000165",
+ "uuid": "00000000-0000-0000-0000-000000000165",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -1981,7 +1981,7 @@
"objects": [
{
"object_name": "165_url_object",
- "object_id": "00000000-0000-0000-0000-000000000155",
+ "uuid": "00000000-0000-0000-0000-000000000155",
"items": [
{
"table_name": "HTTP_URL",
@@ -2001,7 +2001,7 @@
"objects": [
{
"object_name": "165_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000156",
+ "uuid": "00000000-0000-0000-0000-000000000156",
"items": [
{
"table_type": "ip",
@@ -2017,7 +2017,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000166",
+ "uuid": "00000000-0000-0000-0000-000000000166",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2031,7 +2031,7 @@
"objects": [
{
"object_name": "166_url_object",
- "object_id": "00000000-0000-0000-0000-000000000157",
+ "uuid": "00000000-0000-0000-0000-000000000157",
"items": [
{
"table_name": "HTTP_URL",
@@ -2048,7 +2048,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000167",
+ "uuid": "00000000-0000-0000-0000-000000000167",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2060,13 +2060,13 @@
{
"attribute": "HTTP_URL",
"condition_index": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000158"
]
},
{
"attribute": "HTTP_URL",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000158"
],
"condition_index": 3
@@ -2074,7 +2074,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000168",
+ "uuid": "00000000-0000-0000-0000-000000000168",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2085,14 +2085,14 @@
"conditions": [
{
"attribute": "HTTP_URL",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000158"
],
"condition_index": 2
},
{
"attribute": "HTTP_URL",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000158"
],
"condition_index": 6
@@ -2100,7 +2100,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000169",
+ "uuid": "00000000-0000-0000-0000-000000000169",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2115,7 +2115,7 @@
"objects": [
{
"object_name": "169_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000160",
+ "uuid": "00000000-0000-0000-0000-000000000160",
"items": [
{
"table_type": "ip",
@@ -2131,7 +2131,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000170",
+ "uuid": "00000000-0000-0000-0000-000000000170",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2145,7 +2145,7 @@
"objects": [
{
"object_name": "ipv4_attribute.source",
- "object_id": "00000000-0000-0000-0000-000000000161",
+ "uuid": "00000000-0000-0000-0000-000000000161",
"items": [
{
"table_type": "ip",
@@ -2161,7 +2161,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000171",
+ "uuid": "00000000-0000-0000-0000-000000000171",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2175,7 +2175,7 @@
"objects": [
{
"object_name": "ipv4_attribute.destination",
- "object_id": "00000000-0000-0000-0000-000000000162",
+ "uuid": "00000000-0000-0000-0000-000000000162",
"items": [
{
"table_type": "ip",
@@ -2191,7 +2191,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000177",
+ "uuid": "00000000-0000-0000-0000-000000000177",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2202,7 +2202,7 @@
{
"attribute": "ASN_NOT_LOGIC",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000003",
"00000000-0000-0000-0000-000000000004"
@@ -2212,7 +2212,7 @@
{
"attribute": "DESTINATION_IP_ASN",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000002"
],
"condition_index": 1
@@ -2220,7 +2220,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000178",
+ "uuid": "00000000-0000-0000-0000-000000000178",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2230,7 +2230,7 @@
"conditions": [
{
"attribute": "SOURCE_IP_ASN",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000003",
"00000000-0000-0000-0000-000000000004"
@@ -2241,7 +2241,7 @@
{
"attribute": "DESTINATION_IP_ASN",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000002"
],
"condition_index": 1
@@ -2249,7 +2249,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000180",
+ "uuid": "00000000-0000-0000-0000-000000000180",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2260,7 +2260,7 @@
{
"attribute": "SOURCE_IP_ASN",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000003",
"00000000-0000-0000-0000-000000000004"
@@ -2270,7 +2270,7 @@
{
"attribute": "SOURCE_IP_GEO",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000015"
],
"condition_index": 0
@@ -2278,7 +2278,7 @@
{
"attribute": "IP_CONFIG",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000012"
],
"condition_index": 1
@@ -2286,7 +2286,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000181",
+ "uuid": "00000000-0000-0000-0000-000000000181",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2297,7 +2297,7 @@
{
"attribute": "SOURCE_IP_ASN",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000003",
"00000000-0000-0000-0000-000000000004"
@@ -2307,7 +2307,7 @@
{
"attribute": "IP_PLUS_CONFIG",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000014"
],
"condition_index": 0
@@ -2315,7 +2315,7 @@
{
"attribute": "SOURCE_IP_GEO",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000015"
],
"condition_index": 1
@@ -2323,7 +2323,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000182",
+ "uuid": "00000000-0000-0000-0000-000000000182",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2336,7 +2336,7 @@
"objects": [
{
"object_name": "182_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000167",
+ "uuid": "00000000-0000-0000-0000-000000000167",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -2353,7 +2353,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000184",
+ "uuid": "00000000-0000-0000-0000-000000000184",
"user_region": "APP_ID=6006740;Liumengyan-Bugreport-20210515",
"description": "Hulu",
"is_valid": "yes",
@@ -2367,7 +2367,7 @@
"objects": [
{
"object_name": "184_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000169",
+ "uuid": "00000000-0000-0000-0000-000000000169",
"items": [
{
"table_name": "IP_CONFIG",
@@ -2383,7 +2383,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000185",
+ "uuid": "00000000-0000-0000-0000-000000000185",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2394,7 +2394,7 @@
{
"attribute": "DESTINATION_IP_ASN",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000001",
"00000000-0000-0000-0000-000000000003",
"00000000-0000-0000-0000-000000000004"
@@ -2404,7 +2404,7 @@
{
"attribute": "SOURCE_IP_GEO",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000015"
],
"condition_index": 0
@@ -2412,7 +2412,7 @@
{
"attribute": "DESTINATION_IP_ASN",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000005"
],
"condition_index": 1
@@ -2420,7 +2420,7 @@
{
"attribute": "DESTINATION_IP_ASN",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000006"
],
"condition_index": 2
@@ -2428,7 +2428,7 @@
{
"attribute": "IP_PLUS_CONFIG",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000013"
],
"condition_index": 3
@@ -2436,7 +2436,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000186",
+ "uuid": "00000000-0000-0000-0000-000000000186",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2450,7 +2450,7 @@
"objects": [
{
"object_name": "186_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000170",
+ "uuid": "00000000-0000-0000-0000-000000000170",
"items": [
{
"table_name": "HTTP_URL",
@@ -2470,7 +2470,7 @@
"objects": [
{
"object_name": "186_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000171",
+ "uuid": "00000000-0000-0000-0000-000000000171",
"items": [
{
"table_type": "ip",
@@ -2486,7 +2486,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000187",
+ "uuid": "00000000-0000-0000-0000-000000000187",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2500,7 +2500,7 @@
"objects": [
{
"object_name": "187_url_object",
- "object_id": "00000000-0000-0000-0000-000000000172",
+ "uuid": "00000000-0000-0000-0000-000000000172",
"items": [
{
"table_name": "HTTP_URL",
@@ -2520,7 +2520,7 @@
"objects": [
{
"object_name": "187_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000173",
+ "uuid": "00000000-0000-0000-0000-000000000173",
"items": [
{
"table_type": "ip",
@@ -2536,7 +2536,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000188",
+ "uuid": "00000000-0000-0000-0000-000000000188",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2550,7 +2550,7 @@
"objects": [
{
"object_name": "188_url_object",
- "object_id": "00000000-0000-0000-0000-000000000174",
+ "uuid": "00000000-0000-0000-0000-000000000174",
"items": [
{
"table_name": "HTTP_URL",
@@ -2570,7 +2570,7 @@
"objects": [
{
"object_name": "188_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000175",
+ "uuid": "00000000-0000-0000-0000-000000000175",
"items": [
{
"table_type": "ip",
@@ -2586,7 +2586,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000189",
+ "uuid": "00000000-0000-0000-0000-000000000189",
"is_valid": "yes",
"do_log": 0,
"action": 0,
@@ -2599,7 +2599,7 @@
"objects": [
{
"object_name": "189_app_object",
- "object_id": "00000000-0000-0000-0000-000000000176",
+ "uuid": "00000000-0000-0000-0000-000000000176",
"items": [
{
"table_name": "APP_PAYLOAD",
@@ -2617,7 +2617,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000191",
+ "uuid": "00000000-0000-0000-0000-000000000191",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2630,7 +2630,7 @@
"objects": [
{
"object_name": "191_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000178",
+ "uuid": "00000000-0000-0000-0000-000000000178",
"items": [
{
"table_type": "expr",
@@ -2647,7 +2647,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000192",
+ "uuid": "00000000-0000-0000-0000-000000000192",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2660,7 +2660,7 @@
"objects": [
{
"object_name": "192_flag_object",
- "object_id": "00000000-0000-0000-0000-000000000179",
+ "uuid": "00000000-0000-0000-0000-000000000179",
"items": [
{
"table_type": "flag",
@@ -2677,7 +2677,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000193",
+ "uuid": "00000000-0000-0000-0000-000000000193",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2690,7 +2690,7 @@
"objects": [
{
"object_name": "193_flag_object",
- "object_id": "00000000-0000-0000-0000-000000000180",
+ "uuid": "00000000-0000-0000-0000-000000000180",
"items": [
{
"table_type": "flag",
@@ -2709,7 +2709,7 @@
"objects": [
{
"object_name": "193_url_object",
- "object_id": "00000000-0000-0000-0000-000000000181",
+ "uuid": "00000000-0000-0000-0000-000000000181",
"items": [
{
"table_name": "HTTP_URL",
@@ -2726,7 +2726,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000194",
+ "uuid": "00000000-0000-0000-0000-000000000194",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2739,7 +2739,7 @@
"objects": [
{
"object_name": "194_flag_object",
- "object_id": "00000000-0000-0000-0000-000000000182",
+ "uuid": "00000000-0000-0000-0000-000000000182",
"items": [
{
"table_type": "flag",
@@ -2756,7 +2756,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000197",
+ "uuid": "00000000-0000-0000-0000-000000000197",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2769,7 +2769,7 @@
"objects": [
{
"object_name": "197_url_object",
- "object_id": "00000000-0000-0000-0000-000000000186",
+ "uuid": "00000000-0000-0000-0000-000000000186",
"items": [
{
"table_name": "HTTP_URL",
@@ -2786,7 +2786,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000198",
+ "uuid": "00000000-0000-0000-0000-000000000198",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2801,7 +2801,7 @@
"objects": [
{
"object_name": "198_url_object",
- "object_id": "00000000-0000-0000-0000-000000000187",
+ "uuid": "00000000-0000-0000-0000-000000000187",
"items": [
{
"table_name": "HTTP_URL",
@@ -2818,7 +2818,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000199",
+ "uuid": "00000000-0000-0000-0000-000000000199",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2829,14 +2829,14 @@
{
"attribute": "HTTP_URL",
"object_name": "ExcludeLogicObject199",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000503"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000200",
+ "uuid": "00000000-0000-0000-0000-000000000200",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2846,14 +2846,14 @@
"conditions": [
{
"attribute": "HTTP_URL",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000504"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000202",
+ "uuid": "00000000-0000-0000-0000-000000000202",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2864,7 +2864,7 @@
{
"attribute": "ATTRIBUTE_IP_PLUS_TABLE",
"object_name": "ExcludeLogicObject202",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000505"
],
"condition_index": 0
@@ -2872,7 +2872,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000203",
+ "uuid": "00000000-0000-0000-0000-000000000203",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2886,7 +2886,7 @@
"objects": [
{
"object_name": "ExcludeLogicObject203_1",
- "object_id": "00000000-0000-0000-0000-000000000198",
+ "uuid": "00000000-0000-0000-0000-000000000198",
"items": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2905,7 +2905,7 @@
"objects": [
{
"object_name": "ExcludeLogicObject203_2",
- "object_id": "00000000-0000-0000-0000-000000000199",
+ "uuid": "00000000-0000-0000-0000-000000000199",
"items": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2921,7 +2921,7 @@
{
"attribute": "HTTP_RESPONSE_KEYWORDS",
"object_name": "ExcludeLogicObject203_3",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000506"
],
"condition_index": 2
@@ -2929,7 +2929,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000204",
+ "uuid": "00000000-0000-0000-0000-000000000204",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -2943,7 +2943,7 @@
"objects": [
{
"object_name": "ExcludeLogicObject204_1",
- "object_id": "00000000-0000-0000-0000-000000000203",
+ "uuid": "00000000-0000-0000-0000-000000000203",
"items": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2962,7 +2962,7 @@
"objects": [
{
"object_name": "ExcludeLogicObject204_2",
- "object_id": "00000000-0000-0000-0000-000000000204",
+ "uuid": "00000000-0000-0000-0000-000000000204",
"items": [
{
"table_name": "IP_PLUS_CONFIG",
@@ -2977,7 +2977,7 @@
},
{
"attribute": "HTTP_RESPONSE_KEYWORDS",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000508"
],
"condition_index": 2
@@ -2985,7 +2985,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000205",
+ "uuid": "00000000-0000-0000-0000-000000000205",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -2998,7 +2998,7 @@
"objects": [
{
"object_name": "205_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000210",
+ "uuid": "00000000-0000-0000-0000-000000000210",
"items": [
{
"table_type": "expr",
@@ -3015,7 +3015,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000206",
+ "uuid": "00000000-0000-0000-0000-000000000206",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3028,7 +3028,7 @@
"objects": [
{
"object_name": "206_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000211",
+ "uuid": "00000000-0000-0000-0000-000000000211",
"items": [
{
"table_type": "expr",
@@ -3045,7 +3045,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000207",
+ "uuid": "00000000-0000-0000-0000-000000000207",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3058,7 +3058,7 @@
"objects": [
{
"object_name": "207_flag_object",
- "object_id": "00000000-0000-0000-0000-000000000212",
+ "uuid": "00000000-0000-0000-0000-000000000212",
"items": [
{
"table_type": "flag",
@@ -3075,7 +3075,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000208",
+ "uuid": "00000000-0000-0000-0000-000000000208",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3089,7 +3089,7 @@
"objects": [
{
"object_name": "208_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000213",
+ "uuid": "00000000-0000-0000-0000-000000000213",
"items": [
{
"table_type": "ip",
@@ -3105,7 +3105,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000210",
+ "uuid": "00000000-0000-0000-0000-000000000210",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3118,7 +3118,7 @@
"objects": [
{
"object_name": "210_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000215",
+ "uuid": "00000000-0000-0000-0000-000000000215",
"items": [
{
"table_type": "ip",
@@ -3134,7 +3134,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000211",
+ "uuid": "00000000-0000-0000-0000-000000000211",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3148,7 +3148,7 @@
"objects": [
{
"object_name": "211_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000216",
+ "uuid": "00000000-0000-0000-0000-000000000216",
"items": [
{
"table_type": "ip",
@@ -3164,7 +3164,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000212",
+ "uuid": "00000000-0000-0000-0000-000000000212",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3177,7 +3177,7 @@
"objects": [
{
"object_name": "212_interval_object",
- "object_id": "00000000-0000-0000-0000-000000000217",
+ "uuid": "00000000-0000-0000-0000-000000000217",
"items": [
{
"table_name": "INTEGER_PERF_CONFIG",
@@ -3193,7 +3193,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000213",
+ "uuid": "00000000-0000-0000-0000-000000000213",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3206,7 +3206,7 @@
"objects": [
{
"object_name": "213_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000218",
+ "uuid": "00000000-0000-0000-0000-000000000218",
"items": [
{
"table_name": "EXPR_LITERAL_PERF_CONFIG",
@@ -3223,7 +3223,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000214",
+ "uuid": "00000000-0000-0000-0000-000000000214",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3236,7 +3236,7 @@
"objects": [
{
"object_name": "214_flag_object",
- "object_id": "00000000-0000-0000-0000-000000000219",
+ "uuid": "00000000-0000-0000-0000-000000000219",
"items": [
{
"table_type": "flag",
@@ -3253,7 +3253,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000215",
+ "uuid": "00000000-0000-0000-0000-000000000215",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3266,7 +3266,7 @@
"objects": [
{
"object_name": "215_expr_object",
- "object_id": "00000000-0000-0000-0000-000000000220",
+ "uuid": "00000000-0000-0000-0000-000000000220",
"items": [
{
"table_name": "EXPR_REGEX_PERF_CONFIG",
@@ -3283,7 +3283,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000216",
+ "uuid": "00000000-0000-0000-0000-000000000216",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3294,7 +3294,7 @@
{
"attribute": "HTTP_URL_FILTER",
"negate_option": 0,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000504"
],
"condition_index": 0
@@ -3306,7 +3306,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject216",
- "object_id": "00000000-0000-0000-0000-000000000221",
+ "uuid": "00000000-0000-0000-0000-000000000221",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3323,7 +3323,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000217",
+ "uuid": "00000000-0000-0000-0000-000000000217",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3334,7 +3334,7 @@
{
"attribute": "HTTP_URL_FILTER",
"negate_option": 1,
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000509"
],
"condition_index": 0
@@ -3346,7 +3346,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject217_2",
- "object_id": "00000000-0000-0000-0000-000000000225",
+ "uuid": "00000000-0000-0000-0000-000000000225",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3363,7 +3363,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000218",
+ "uuid": "00000000-0000-0000-0000-000000000218",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3376,7 +3376,7 @@
"objects": [
{
"object_name": "218_interval_object",
- "object_id": "00000000-0000-0000-0000-000000000226",
+ "uuid": "00000000-0000-0000-0000-000000000226",
"items": [
{
"table_name": "CONTENT_SIZE",
@@ -3392,7 +3392,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000219",
+ "uuid": "00000000-0000-0000-0000-000000000219",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3407,7 +3407,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_1",
- "object_id": "00000000-0000-0000-0000-000000000227",
+ "uuid": "00000000-0000-0000-0000-000000000227",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3428,7 +3428,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_2",
- "object_id": "00000000-0000-0000-0000-000000000228",
+ "uuid": "00000000-0000-0000-0000-000000000228",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3449,7 +3449,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_3",
- "object_id": "00000000-0000-0000-0000-000000000229",
+ "uuid": "00000000-0000-0000-0000-000000000229",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3470,7 +3470,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_4",
- "object_id": "00000000-0000-0000-0000-000000000230",
+ "uuid": "00000000-0000-0000-0000-000000000230",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3491,7 +3491,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_5",
- "object_id": "00000000-0000-0000-0000-000000000231",
+ "uuid": "00000000-0000-0000-0000-000000000231",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3512,7 +3512,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_6",
- "object_id": "00000000-0000-0000-0000-000000000232",
+ "uuid": "00000000-0000-0000-0000-000000000232",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3533,7 +3533,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_7",
- "object_id": "00000000-0000-0000-0000-000000000233",
+ "uuid": "00000000-0000-0000-0000-000000000233",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3554,7 +3554,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject219_8",
- "object_id": "00000000-0000-0000-0000-000000000234",
+ "uuid": "00000000-0000-0000-0000-000000000234",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3571,7 +3571,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000220",
+ "uuid": "00000000-0000-0000-0000-000000000220",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3586,7 +3586,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject220_1",
- "object_id": "00000000-0000-0000-0000-000000000235",
+ "uuid": "00000000-0000-0000-0000-000000000235",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3607,7 +3607,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject220_2",
- "object_id": "00000000-0000-0000-0000-000000000236",
+ "uuid": "00000000-0000-0000-0000-000000000236",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3628,7 +3628,7 @@
"objects": [
{
"object_name": "NOTConditionAndExcludeObject220_3",
- "object_id": "00000000-0000-0000-0000-000000000237",
+ "uuid": "00000000-0000-0000-0000-000000000237",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3645,7 +3645,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000222",
+ "uuid": "00000000-0000-0000-0000-000000000222",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3660,7 +3660,7 @@
"objects": [
{
"object_name": "NOTLogicObject_222",
- "object_id": "00000000-0000-0000-0000-000000000240",
+ "uuid": "00000000-0000-0000-0000-000000000240",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3677,7 +3677,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000223",
+ "uuid": "00000000-0000-0000-0000-000000000223",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3692,7 +3692,7 @@
"objects": [
{
"object_name": "NOTLogicObject_223_1",
- "object_id": "00000000-0000-0000-0000-000000000241",
+ "uuid": "00000000-0000-0000-0000-000000000241",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3713,7 +3713,7 @@
"objects": [
{
"object_name": "NOTLogicObject_223_2",
- "object_id": "00000000-0000-0000-0000-000000000242",
+ "uuid": "00000000-0000-0000-0000-000000000242",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3734,7 +3734,7 @@
"objects": [
{
"object_name": "NOTLogicObject_223_1",
- "object_id": "00000000-0000-0000-0000-000000000243",
+ "uuid": "00000000-0000-0000-0000-000000000243",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3751,7 +3751,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000224",
+ "uuid": "00000000-0000-0000-0000-000000000224",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3766,7 +3766,7 @@
"objects": [
{
"object_name": "NOTLogicObject_224_1",
- "object_id": "00000000-0000-0000-0000-000000000244",
+ "uuid": "00000000-0000-0000-0000-000000000244",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3787,7 +3787,7 @@
"objects": [
{
"object_name": "NOTLogicObject_224_2",
- "object_id": "00000000-0000-0000-0000-000000000245",
+ "uuid": "00000000-0000-0000-0000-000000000245",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3804,7 +3804,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000225",
+ "uuid": "00000000-0000-0000-0000-000000000225",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3819,7 +3819,7 @@
"objects": [
{
"object_name": "EscapeObject_225_1",
- "object_id": "00000000-0000-0000-0000-000000000246",
+ "uuid": "00000000-0000-0000-0000-000000000246",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -3836,7 +3836,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000226",
+ "uuid": "00000000-0000-0000-0000-000000000226",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3847,14 +3847,14 @@
{
"attribute": "KEYWORDS_TABLE",
"object_name": "226_url_object",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000247"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000227",
+ "uuid": "00000000-0000-0000-0000-000000000227",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3866,14 +3866,14 @@
{
"attribute": "KEYWORDS_TABLE",
"object_name": "227_url_object",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000248"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000228",
+ "uuid": "00000000-0000-0000-0000-000000000228",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3888,7 +3888,7 @@
"objects": [
{
"object_name": "228_url_object",
- "object_id": "00000000-0000-0000-0000-000000000249",
+ "uuid": "00000000-0000-0000-0000-000000000249",
"items": [
{
"table_name": "HTTP_URL",
@@ -3909,7 +3909,7 @@
"objects": [
{
"object_name": "228_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000250",
+ "uuid": "00000000-0000-0000-0000-000000000250",
"items": [
{
"table_name": "IP_CONFIG",
@@ -3925,7 +3925,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000229",
+ "uuid": "00000000-0000-0000-0000-000000000229",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -3938,7 +3938,7 @@
"objects": [
{
"object_name": "229_url_object",
- "object_id": "00000000-0000-0000-0000-000000000251",
+ "uuid": "00000000-0000-0000-0000-000000000251",
"items": [
{
"table_name": "HTTP_URL",
@@ -3955,7 +3955,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000230",
+ "uuid": "00000000-0000-0000-0000-000000000230",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3968,7 +3968,7 @@
"objects": [
{
"object_name": "230_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000256",
+ "uuid": "00000000-0000-0000-0000-000000000256",
"items": [
{
"table_type": "ip",
@@ -3985,7 +3985,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000231",
+ "uuid": "00000000-0000-0000-0000-000000000231",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -3998,7 +3998,7 @@
"objects": [
{
"object_name": "231_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000257",
+ "uuid": "00000000-0000-0000-0000-000000000257",
"items": [
{
"table_type": "ip",
@@ -4015,7 +4015,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000232",
+ "uuid": "00000000-0000-0000-0000-000000000232",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -4028,7 +4028,7 @@
"objects": [
{
"object_name": "232_IP_object",
- "object_id": "00000000-0000-0000-0000-000000000258",
+ "uuid": "00000000-0000-0000-0000-000000000258",
"items": [
{
"table_type": "ip",
@@ -4045,7 +4045,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000233",
+ "uuid": "00000000-0000-0000-0000-000000000233",
"service": 1,
"action": 1,
"do_blacklist": 1,
@@ -4056,14 +4056,14 @@
{
"attribute": "HTTP_RESPONSE_KEYWORDS",
"object_name": "233_url_object",
- "object_ids": [
+ "object_uuids": [
"00000000-0000-0000-0000-000000000259"
]
}
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000234",
+ "uuid": "00000000-0000-0000-0000-000000000234",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -4078,7 +4078,7 @@
"objects": [
{
"object_name": "EscapeObject_234_1",
- "object_id": "00000000-0000-0000-0000-000000000260",
+ "uuid": "00000000-0000-0000-0000-000000000260",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -4095,7 +4095,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000235",
+ "uuid": "00000000-0000-0000-0000-000000000235",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -4110,7 +4110,7 @@
"objects": [
{
"object_name": "EscapeObject_235_1",
- "object_id": "00000000-0000-0000-0000-000000000261",
+ "uuid": "00000000-0000-0000-0000-000000000261",
"items": [
{
"table_name": "KEYWORDS_TABLE",
@@ -4127,7 +4127,7 @@
]
},
{
- "rule_id": "00000000-0000-0000-0000-000000000236",
+ "uuid": "00000000-0000-0000-0000-000000000236",
"service": 0,
"action": 0,
"do_blacklist": 0,
@@ -4140,7 +4140,7 @@
"objects": [
{
"object_name": "236_keywords_object",
- "object_id": "00000000-0000-0000-0000-000000000262",
+ "uuid": "00000000-0000-0000-0000-000000000262",
"items": [
{
"table_type": "expr",
diff --git a/test/table_info.json b/test/table_info.json
index 8180af4..efd2307 100644
--- a/test/table_info.json
+++ b/test/table_info.json
@@ -44,7 +44,7 @@
"gc_timeout_s":3,
"key_type":"integer",
"key_len":8,
- "key_name": "rule_id"
+ "key_name": "uuid"
}
},
{
diff --git a/test/test_utils.cpp b/test/test_utils.cpp
index 56f46fc..dbe563d 100644
--- a/test/test_utils.cpp
+++ b/test/test_utils.cpp
@@ -120,17 +120,44 @@ int rule_table_set_line(struct maat *maat_inst, const char *table_name,
const char *user_region, struct maat_cmd_condition conditions[],
int condition_num, int expire_after)
{
- char table_line[1024 * 16] = {0};
- sprintf(table_line, "%lld\t0\t0\t0\t0\t0\t%s\t%d\t%d\t0.0",
- rule_id, user_region, condition_num, op);
+ cJSON *json_root = cJSON_CreateObject();
+ char uuid_str[UUID_STR_LEN] = {0};
+
+ uuid_unparse(rule_uuid, uuid_str);
+ cJSON_AddStringToObject(json_root, "uuid", uuid_str);
+ cJSON *conditions_array = cJSON_CreateArray();
+
+ for (int i = 0; i < condition_num; i++) {
+ cJSON *condition = cJSON_CreateObject();
+ cJSON_AddStringToObject(condition, "attribute_name", conditions[i].attribute_name);
+ if (conditions[i].negate_option) {
+ cJSON_AddStringToObject(condition, "negate_option", "true");
+ } else {
+ cJSON_AddStringToObject(condition, "negate_option", "false");
+ }
+
+ cJSON *object_uuids_array = cJSON_CreateArray();
+ for (int j = 0; j < conditions[i].object_num; j++) {
+ cJSON_AddItemToArray(object_uuids_array, cJSON_CreateString(conditions[i].object_uuids_str[j]));
+ }
+ cJSON_AddItemToObject(condition, "object_uuids", object_uuids_array);
+ cJSON_AddItemToArray(conditions_array, condition);
+ }
+
+ cJSON_AddItemToObject(json_root, "conditions", conditions_array);
+
+ char *json_str = cJSON_PrintUnformatted(json_root);
struct maat_cmd_line line_rule;
- line_rule.rule_id = rule_id;
- line_rule.table_line = table_line;
+ line_rule.rule_uuid_str = uuid_str;
+ line_rule.table_line = json_str;
line_rule.table_name = table_name;
line_rule.expire_after = expire_after;
- return maat_cmd_set_line(maat_inst, &line_rule, op);
+ int ret = maat_cmd_set_line(maat_inst, &line_rule, op);
+ free(json_str);
+
+ return ret;
}
#if 0 //TODO
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 17:37:09 +0000