Optimize:使用Utarray存储library命中路径, 优化Tunnel命中路径的合并, 增加测试用例的CI构建
This commit is contained in:
@@ -8,7 +8,9 @@ set(CMAKE_BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
|
||||
set(TEST_RUN_DIR ${CMAKE_BUILD_DIR}/test)
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/resource DESTINATION ${TEST_RUN_DIR})
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/conf DESTINATION ${TEST_RUN_DIR})
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/test/resource/VerifyPolicyHit.json DESTINATION ${TEST_RUN_DIR}/resource)
|
||||
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/test/resource/VerifyPolicyManipulation.json DESTINATION ${TEST_RUN_DIR}/resource)
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/test/resource/VerifyPolicyTunnel.json DESTINATION ${TEST_RUN_DIR}/resource)
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/test/resource/HitPolicyResult.json DESTINATION ${TEST_RUN_DIR}/resource)
|
||||
file(COPY ${CMAKE_SOURCE_DIR}/test/resource/HitPolicyRequest.json DESTINATION ${TEST_RUN_DIR}/resource)
|
||||
|
||||
@@ -16,4 +18,8 @@ add_test(NAME UPDATE_MAAT_MODE COMMAND bash -c "sed -i 's/maat_input_mode=1/maa
|
||||
add_test(NAME UPDATE_LOG_LEVEL COMMAND bash -c "sed -i 's/log_level=5/log_level=1/' ${TEST_RUN_DIR}/conf/verify_policy.conf")
|
||||
add_test(NAME UPDATE_VSYS_NUM COMMAND bash -c "sed -i '32i load_vsys_num=2' ${TEST_RUN_DIR}/conf/verify_policy.conf")
|
||||
add_test(NAME UPDATE_START_VSYS COMMAND bash -c "sed -i '33i load_start_vsys=1' ${TEST_RUN_DIR}/conf/verify_policy.conf")
|
||||
add_test(NAME UPDATE_JSON_FILE COMMAND bash -c "sed -i 's/json_cfg_file=\\.\\/resource\\/verify-policy\\.json/json_cfg_file=\\.\\/resource\\/VerifyPolicyHit\\.json/' ${TEST_RUN_DIR}/conf/verify_policy.conf")
|
||||
add_test(NAME UPDATE_JSON_FILE COMMAND bash -c "sed -i 's/json_cfg_file=\\.\\/resource\\/verify-policy\\.json/json_cfg_file=\\.\\/resource\\/VerifyPolicyManipulation\\.json/' ${TEST_RUN_DIR}/conf/verify_policy.conf")
|
||||
add_test(NAME COPY_CONF COMMAND sh -c "cp ${TEST_RUN_DIR}/conf/verify_policy.conf ${TEST_RUN_DIR}/conf/verify_policy2.conf")
|
||||
add_test(NAME UPDATE_JSON_FILE2 COMMAND bash -c "sed -i 's/json_cfg_file=\\.\\/resource\\/VerifyPolicyManipulation\\.json/json_cfg_file=\\.\\/resource\\/VerifyPolicyTunnel\\.json/' ${TEST_RUN_DIR}/conf/verify_policy2.conf")
|
||||
|
||||
add_test(NAME VERIFY_POLICY_TEST COMMAND verify_policy_test)
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"Verify_Policy_Request": [
|
||||
{
|
||||
"__item_id": 0,
|
||||
"vsys_id": 1,
|
||||
"verify_list": [
|
||||
{
|
||||
@@ -25,6 +26,7 @@
|
||||
"verify_type": "policy"
|
||||
},
|
||||
{
|
||||
"__item_id": 1,
|
||||
"vsys_id": 1,
|
||||
"verify_list": [
|
||||
{
|
||||
@@ -65,6 +67,91 @@
|
||||
}
|
||||
],
|
||||
"verify_type": "policy"
|
||||
},
|
||||
{
|
||||
"__item_id": 2,
|
||||
"vsys_id": 1,
|
||||
"verify_list": [
|
||||
{
|
||||
"type": "security",
|
||||
"vsys_id": 1,
|
||||
"verify_session": {
|
||||
"attributes": [
|
||||
{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpointa",
|
||||
"attribute_value": {
|
||||
"ip": "192.168.0.1",
|
||||
"tunnel_type":"gtp",
|
||||
"addr_type": 4
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"verify_type": "policy"
|
||||
},
|
||||
{
|
||||
"__item_id": 3,
|
||||
"vsys_id": 1,
|
||||
"verify_list": [
|
||||
{
|
||||
"type": "security",
|
||||
"vsys_id": 1,
|
||||
"verify_session": {
|
||||
"attributes": [
|
||||
{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpointb",
|
||||
"attribute_value": {
|
||||
"ip": "192.168.0.2",
|
||||
"tunnel_type":"gtp",
|
||||
"addr_type": 4
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"verify_type": "policy"
|
||||
},
|
||||
{
|
||||
"__item_id": 4,
|
||||
"vsys_id": 1,
|
||||
"verify_list": [
|
||||
{
|
||||
"type": "security",
|
||||
"vsys_id": 1,
|
||||
"verify_session": {
|
||||
"attributes": [
|
||||
{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpointa",
|
||||
"attribute_value": {
|
||||
"ip": "192.168.0.2",
|
||||
"tunnel_type":"gtp",
|
||||
"addr_type": 4
|
||||
}
|
||||
},
|
||||
{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpointb",
|
||||
"attribute_value": {
|
||||
"ip": "192.168.0.3",
|
||||
"tunnel_type":"gtp",
|
||||
"addr_type": 4
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"verify_type": "policy"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -129,6 +129,68 @@
|
||||
}
|
||||
},
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"code": 200,
|
||||
"msg": "Success",
|
||||
"data": {
|
||||
"verify_session": {
|
||||
"attributes": [{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpoint_object",
|
||||
"hit_paths": [{
|
||||
"item_id": 0,
|
||||
"superior_object_id": 3021
|
||||
}]
|
||||
}]
|
||||
}
|
||||
},
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"code": 200,
|
||||
"msg": "Success",
|
||||
"data": {
|
||||
"verify_session": {
|
||||
"attributes": [{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpoint_object",
|
||||
"hit_paths": [{
|
||||
"item_id": 0,
|
||||
"superior_object_id": 3022
|
||||
}]
|
||||
}]
|
||||
}
|
||||
},
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"code": 200,
|
||||
"msg": "Success",
|
||||
"data": {
|
||||
"verify_session": {
|
||||
"attributes": [
|
||||
{
|
||||
"attribute_type": "ip",
|
||||
"table_name": "ATTR_TUNNEL",
|
||||
"attribute_name": "tunnel_endpoint_object",
|
||||
"hit_paths": [
|
||||
{
|
||||
"item_id": 0,
|
||||
"superior_object_id": 3022
|
||||
},
|
||||
{
|
||||
"item_id": 0,
|
||||
"superior_object_id": 3023
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"success": true
|
||||
}
|
||||
]
|
||||
}
|
||||
101
test/resource/VerifyPolicyManipulation.json
Normal file
101
test/resource/VerifyPolicyManipulation.json
Normal file
@@ -0,0 +1,101 @@
|
||||
{
|
||||
"compile_table": "PXY_CTRL_COMPILE",
|
||||
"group2compile_table": "GROUP_PXY_CTRL_COMPILE_RELATION",
|
||||
"group2group_table": "GROUP_GROUP_RELATION",
|
||||
"rules": [
|
||||
{
|
||||
"compile_id": 1021,
|
||||
"service": 1,
|
||||
"action": 48,
|
||||
"do_blacklist": 1,
|
||||
"do_log": 1,
|
||||
"effective_range": 0,
|
||||
"tags":"anything",
|
||||
"user_region": "anything",
|
||||
"is_valid": "yes",
|
||||
"groups": [
|
||||
{
|
||||
"not_flag": 0,
|
||||
"group_id": 101,
|
||||
"group_name":"IPv4TCPSoureVeiryPolicy01",
|
||||
"virtual_table": "ATTR_SOURCE_IP",
|
||||
"regions": [
|
||||
{
|
||||
"table_type": "ip",
|
||||
"table_name": "TSG_OBJ_IP_ADDR",
|
||||
"table_content": {
|
||||
"addr_type": "ipv4",
|
||||
"addr_format": "range",
|
||||
"ip1": "192.168.0.1",
|
||||
"ip2": "192.168.0.1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"compile_id": 1022,
|
||||
"service": 1,
|
||||
"action": 48,
|
||||
"do_blacklist": 1,
|
||||
"do_log": 1,
|
||||
"effective_range": 0,
|
||||
"tags":"anything",
|
||||
"user_region": "anything",
|
||||
"is_valid": "yes",
|
||||
"groups": [
|
||||
{
|
||||
"group_id": 11,
|
||||
"group_name": "IPv4TCPSoureEntry.11",
|
||||
"virtual_table": "ATTR_SOURCE_IP"
|
||||
},
|
||||
{
|
||||
"group_id": 12,
|
||||
"group_name": "IPv4TCPSoureEntry.12",
|
||||
"virtual_table": "ATTR_INTERNAL_IP"
|
||||
},
|
||||
{
|
||||
"group_id": 1,
|
||||
"group_name": "FQDNEntry.1",
|
||||
"virtual_table": "ATTR_SERVER_FQDN"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"plugin_table": [
|
||||
{
|
||||
"table_name": "FQDN_ENTRY",
|
||||
"table_content": [
|
||||
"1\t1\twww.126.com\t1\t1",
|
||||
"2\t2,3\twww.baidu.com\t1\t1",
|
||||
"4\t4,5,6\twww.qq.com\t1\t1"
|
||||
]
|
||||
},
|
||||
{
|
||||
"table_name": "IP_ADDR_ENTRY",
|
||||
"table_content": [
|
||||
"1\t11\t4\tsingle\t192.168.1.1\t192.168.1.1\t1",
|
||||
"2\t12,13\t4\tsingle\t192.168.1.2\t192.168.1.2\t1",
|
||||
"4\t14,15,16\t4\trange\t192.168.1.3\t192.168.1.3\t1"
|
||||
]
|
||||
},
|
||||
{
|
||||
"table_name": "LIBRARY_TAG",
|
||||
"table_content": [
|
||||
"1\tnone\twebsite_category\tfqdn1\tsearch\\bengines\t1",
|
||||
"2\tnone\twebsite_category\tfqdn2\tRecreation\band\bHobbies\t1",
|
||||
"3\tnone\twebsite_category\tfqdn3\tbusiness\t1",
|
||||
"4\tnone\twebsite_category\tfqdn4\tsearch bengines\t1",
|
||||
"5\tnone\twebsite_category\tfqdn5\tsearch\\bengines\t1",
|
||||
"6\tnone\twebsite_category\tfqdn6\tsearch\\bengines\t1",
|
||||
"11\tnone\tgeoip\tadministrative_area\tColombia.Departamento\bdel\bVaupes\t1",
|
||||
"12\tnone\tgeoip\tadministrative_area\tColombia.Departamento\bdel\bVaupes.Mitú\t1",
|
||||
"13\tnone\tgeoip\tadministrative_area\tColombia.Antioquia.Marinilla\t1",
|
||||
"14\tnone\tgeoip\tsuper_administrative_area\tColombia.Departamento\bdel\bVaupes\t1",
|
||||
"15\tnone\tgeoip\tadministrative_area\tGermany.Bavaria.Mauern\t1",
|
||||
"16\tnone\tgeoip\tadministrative_area\tGermany.Bavaria.Mellrichstadt\t1"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
118
test/resource/VerifyPolicyTunnel.json
Normal file
118
test/resource/VerifyPolicyTunnel.json
Normal file
@@ -0,0 +1,118 @@
|
||||
{
|
||||
"compile_table": "TUNNEL_COMPILE",
|
||||
"group2compile_table": "GROUP_TUNNEL_COMPILE_RELATION",
|
||||
"group2group_table": "GROUP_GROUP_RELATION",
|
||||
"rules": [
|
||||
{
|
||||
"compile_id": 3021,
|
||||
"service": 13,
|
||||
"action": 1,
|
||||
"do_blacklist": 0,
|
||||
"do_log": 1,
|
||||
"tags": "{}",
|
||||
"user_region": "anything",
|
||||
"evaluation_order": "0.0",
|
||||
"is_valid": "yes",
|
||||
"groups": [
|
||||
{
|
||||
"not_flag": 0,
|
||||
"group_id": 1,
|
||||
"group_name": "TunnelIpv4TCPSoureVeiryPolicy01",
|
||||
"virtual_table": "ATTR_TUNNEL_GTP_ENDPOINT",
|
||||
"regions": [
|
||||
{
|
||||
"table_name": "TSG_OBJ_IP_ADDR",
|
||||
"table_type": "ip",
|
||||
"table_content": {
|
||||
"addr_type": "ipv4",
|
||||
"addr_format": "range",
|
||||
"ip1": "192.168.0.1",
|
||||
"ip2": "192.168.0.1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"compile_id": 3022,
|
||||
"service": 13,
|
||||
"action": 1,
|
||||
"do_blacklist": 0,
|
||||
"do_log": 1,
|
||||
"tags": "{}",
|
||||
"user_region": "anything",
|
||||
"evaluation_order": "0.0",
|
||||
"is_valid": "yes",
|
||||
"groups": [
|
||||
{
|
||||
"not_flag": 0,
|
||||
"group_id": 2,
|
||||
"group_name": "TunnelIpv4TCPSoureVeiryPolicy02",
|
||||
"virtual_table": "ATTR_TUNNEL_GTP_ENDPOINT",
|
||||
"regions": [
|
||||
{
|
||||
"table_name": "TSG_OBJ_IP_ADDR",
|
||||
"table_type": "ip",
|
||||
"table_content": {
|
||||
"addr_type": "ipv4",
|
||||
"addr_format": "range",
|
||||
"ip1": "192.168.0.2",
|
||||
"ip2": "192.168.0.2"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"compile_id": 3023,
|
||||
"service": 13,
|
||||
"action": 1,
|
||||
"do_blacklist": 0,
|
||||
"do_log": 1,
|
||||
"tags": "{}",
|
||||
"user_region": "anything",
|
||||
"evaluation_order": "0.0",
|
||||
"is_valid": "yes",
|
||||
"groups": [
|
||||
{
|
||||
"not_flag": 0,
|
||||
"group_id": 3,
|
||||
"group_name": "TunnelIpv4TCPSoureVeiryPolicy03",
|
||||
"virtual_table": "ATTR_TUNNEL_GTP_ENDPOINT",
|
||||
"regions": [
|
||||
{
|
||||
"table_name": "TSG_OBJ_IP_ADDR",
|
||||
"table_type": "ip",
|
||||
"table_content": {
|
||||
"addr_type": "ipv4",
|
||||
"addr_format": "range",
|
||||
"ip1": "192.168.0.2",
|
||||
"ip2": "192.168.0.2"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"not_flag": 0,
|
||||
"group_id": 4,
|
||||
"group_name": "TunnelIpv4TCPSoureVeiryPolicy04",
|
||||
"virtual_table": "ATTR_TUNNEL_GTP_ENDPOINT",
|
||||
"regions": [
|
||||
{
|
||||
"table_name": "TSG_OBJ_IP_ADDR",
|
||||
"table_type": "ip",
|
||||
"table_content": {
|
||||
"addr_type": "ipv4",
|
||||
"addr_format": "range",
|
||||
"ip1": "192.168.0.3",
|
||||
"ip2": "192.168.0.3"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -25,12 +25,19 @@ struct verify_policy * g_verify_proxy = NULL;
|
||||
extern cJSON *get_library_search_query(const char *data, ssize_t data_len);
|
||||
extern cJSON *get_verify_policy_query(const char *data, ssize_t data_len, int thread_id);
|
||||
|
||||
int load_json_file_system_cmd(const char *load_json_file, const char *run_json_file)
|
||||
int load_json_file_system_cmd(const char *load_json_file, const char *run_json_file, int backup)
|
||||
{
|
||||
char command[1024] = {0};
|
||||
|
||||
if(backup)
|
||||
{
|
||||
snprintf(command, sizeof(command), "cp ./resource/%s ./resource/backup.json", run_json_file);
|
||||
system(command);
|
||||
}
|
||||
|
||||
memset(command, 0, sizeof(command));
|
||||
snprintf(command, sizeof(command), "cp ./resource/%s ./resource/%s", load_json_file, run_json_file);
|
||||
system(command);
|
||||
sleep(2);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -82,46 +89,46 @@ static char *select_hit_policy_request_item(int gtest_id)
|
||||
|
||||
TEST(LibrarySearch, HitFqdnEntry)
|
||||
{
|
||||
const char *cm_http_request = "{\"ip\":null,\"fqdn\":\"www.126.com\",\"vsys_id\":1}";
|
||||
const char *expect_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":1,\"tag_ids\":\"1\"}]},\"success\":true}";
|
||||
const char *hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.126.com\",\"vsys_id\":1}";
|
||||
const char *hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":1,\"tag_ids\":\"1\"}]},\"success\":true}";
|
||||
|
||||
cJSON *result_json = get_library_search_query(cm_http_request, strlen(cm_http_request));
|
||||
cJSON *result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
char *hit_policy_list = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_list != NULL);
|
||||
|
||||
int equal = strncasecmp(hit_policy_list, expect_result, strlen(expect_result));
|
||||
int equal = strncasecmp(hit_policy_list, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_list);
|
||||
|
||||
cm_http_request = "{\"ip\":null,\"fqdn\":\"www.baidu.com\",\"vsys_id\":1}";
|
||||
expect_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":2,\"tag_ids\":\"2,3\"}]},\"success\":true}";
|
||||
hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.baidu.com\",\"vsys_id\":1}";
|
||||
hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":2,\"tag_ids\":\"2,3\"}]},\"success\":true}";
|
||||
|
||||
result_json = get_library_search_query(cm_http_request, strlen(cm_http_request));
|
||||
result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
hit_policy_list = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_list != NULL);
|
||||
|
||||
equal = strncasecmp(hit_policy_list, expect_result, strlen(expect_result));
|
||||
equal = strncasecmp(hit_policy_list, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_list);
|
||||
|
||||
cm_http_request = "{\"ip\":null,\"fqdn\":\"www.qq.com\",\"vsys_id\":1}";
|
||||
expect_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":4,\"tag_ids\":\"4,5,6\"}]},\"success\":true}";
|
||||
hit_policy_request = "{\"ip\":null,\"fqdn\":\"www.qq.com\",\"vsys_id\":1}";
|
||||
hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":4,\"tag_ids\":\"4,5,6\"}]},\"success\":true}";
|
||||
|
||||
result_json = get_library_search_query(cm_http_request, strlen(cm_http_request));
|
||||
result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
hit_policy_list = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_list != NULL);
|
||||
|
||||
equal = strncasecmp(hit_policy_list, expect_result, strlen(expect_result));
|
||||
equal = strncasecmp(hit_policy_list, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
@@ -130,46 +137,46 @@ TEST(LibrarySearch, HitFqdnEntry)
|
||||
|
||||
TEST(LibrarySearch, HitIpEntry)
|
||||
{
|
||||
const char *cm_http_request = "{\"ip\":\"192.168.1.1\",\"fqdn\":null,\"vsys_id\":1}";
|
||||
const char *expect_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":1,\"tag_ids\":\"11\"}]},\"success\":true}";
|
||||
const char *hit_policy_request = "{\"ip\":\"192.168.1.1\",\"fqdn\":null,\"vsys_id\":1}";
|
||||
const char *hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":1,\"tag_ids\":\"11\"}]},\"success\":true}";
|
||||
|
||||
cJSON *result_json = get_library_search_query(cm_http_request, strlen(cm_http_request));
|
||||
cJSON *result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
char *hit_policy_list = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_list != NULL);
|
||||
|
||||
int equal = strncasecmp(hit_policy_list, expect_result, strlen(expect_result));
|
||||
int equal = strncasecmp(hit_policy_list, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_list);
|
||||
|
||||
cm_http_request ="{\"ip\":\"192.168.1.2\",\"fqdn\":null,\"vsys_id\":1}";
|
||||
expect_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":2,\"tag_ids\":\"12,13\"}]},\"success\":true}";
|
||||
hit_policy_request ="{\"ip\":\"192.168.1.2\",\"fqdn\":null,\"vsys_id\":1}";
|
||||
hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":2,\"tag_ids\":\"12,13\"}]},\"success\":true}";
|
||||
|
||||
result_json = get_library_search_query(cm_http_request, strlen(cm_http_request));
|
||||
result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
hit_policy_list = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_list != NULL);
|
||||
|
||||
equal = strncasecmp(hit_policy_list, expect_result, strlen(expect_result));
|
||||
equal = strncasecmp(hit_policy_list, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_list);
|
||||
|
||||
cm_http_request = "{\"ip\":\"192.168.1.3\",\"fqdn\":null,\"vsys_id\":1}";
|
||||
expect_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":4,\"tag_ids\":\"14,15,16\"}]},\"success\":true}";
|
||||
hit_policy_request = "{\"ip\":\"192.168.1.3\",\"fqdn\":null,\"vsys_id\":1}";
|
||||
hit_policy_result="{\"code\":200,\"msg\":\"Success\",\"data\":{\"hit_library\":[{\"entry_id\":4,\"tag_ids\":\"14,15,16\"}]},\"success\":true}";
|
||||
|
||||
result_json = get_library_search_query(cm_http_request, strlen(cm_http_request));
|
||||
result_json = get_library_search_query(hit_policy_request, strlen(hit_policy_request));
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
hit_policy_list = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_list != NULL);
|
||||
|
||||
equal = strncasecmp(hit_policy_list, expect_result, strlen(expect_result));
|
||||
equal = strncasecmp(hit_policy_list, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
@@ -210,7 +217,82 @@ TEST(VerifyPolicy, HitLibraryPolicy)
|
||||
|
||||
char *hit_policy_query = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_query != NULL);
|
||||
//printf("hit_policy_query =%s\n", hit_policy_query);
|
||||
|
||||
int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_query);
|
||||
FREE(&hit_policy_request);
|
||||
FREE(&hit_policy_result);
|
||||
}
|
||||
|
||||
static void reload_maat_config(const char * main_profile)
|
||||
{
|
||||
verify_policy_table_free(main_profile);
|
||||
int ret = verify_policy_table_init(g_verify_proxy, main_profile);
|
||||
CHECK_OR_EXIT(ret == 0, "Failed at init maat module, Exit.");
|
||||
}
|
||||
|
||||
/*Tunnel Endpoint Policy Test**/
|
||||
TEST(VerifyPolicy, HitTunnelEndpointaPolicy)
|
||||
{
|
||||
reload_maat_config("./conf/verify_policy2.conf");
|
||||
char *hit_policy_request = select_hit_policy_request_item(2);
|
||||
ASSERT_TRUE(hit_policy_request != NULL);
|
||||
char *hit_policy_result = select_hit_policy_result_item(2);
|
||||
ASSERT_TRUE(hit_policy_result != NULL);
|
||||
|
||||
cJSON *result_json = get_verify_policy_query(hit_policy_request, strlen(hit_policy_request), 1);
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
char *hit_policy_query = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_query != NULL);
|
||||
|
||||
int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_query);
|
||||
FREE(&hit_policy_request);
|
||||
FREE(&hit_policy_result);
|
||||
}
|
||||
|
||||
TEST(VerifyPolicy, HitTunnelEndpointbPolicy)
|
||||
{
|
||||
char *hit_policy_request = select_hit_policy_request_item(3);
|
||||
ASSERT_TRUE(hit_policy_request != NULL);
|
||||
char *hit_policy_result = select_hit_policy_result_item(3);
|
||||
ASSERT_TRUE(hit_policy_result != NULL);
|
||||
|
||||
cJSON *result_json = get_verify_policy_query(hit_policy_request, strlen(hit_policy_request), 1);
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
char *hit_policy_query = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_query != NULL);
|
||||
|
||||
int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
|
||||
cJSON_Delete(result_json);
|
||||
FREE(&hit_policy_query);
|
||||
FREE(&hit_policy_request);
|
||||
FREE(&hit_policy_result);
|
||||
}
|
||||
|
||||
TEST(VerifyPolicy, HitTunnelEndpointPolicy)
|
||||
{
|
||||
char *hit_policy_request = select_hit_policy_request_item(4);
|
||||
ASSERT_TRUE(hit_policy_request != NULL);
|
||||
char *hit_policy_result = select_hit_policy_result_item(4);
|
||||
ASSERT_TRUE(hit_policy_result != NULL);
|
||||
|
||||
cJSON *result_json = get_verify_policy_query(hit_policy_request, strlen(hit_policy_request), 1);
|
||||
ASSERT_TRUE(result_json != NULL);
|
||||
|
||||
char *hit_policy_query = cJSON_PrintUnformatted(result_json);
|
||||
ASSERT_TRUE(hit_policy_query != NULL);
|
||||
printf("hit_policy_query =%s\n", hit_policy_query);
|
||||
|
||||
int equal = strncasecmp(hit_policy_query, hit_policy_result, strlen(hit_policy_result));
|
||||
EXPECT_EQ(equal, 0);
|
||||
@@ -283,7 +365,8 @@ int main(int argc, char ** argv)
|
||||
g_verify_proxy->logger = log_handle_create(log_path, log_level);
|
||||
CHECK_OR_EXIT(g_verify_proxy->logger != NULL, "Failed at init log module. Exit.");
|
||||
|
||||
ret = maat_table_init(g_verify_proxy, main_profile);
|
||||
g_verify_proxy->nr_work_threads=1;
|
||||
ret = verify_policy_table_init(g_verify_proxy, main_profile);
|
||||
CHECK_OR_EXIT(ret == 0, "Failed at init maat module, Exit.");
|
||||
|
||||
const char *filename1 = "./resource/HitPolicyResult.json";
|
||||
@@ -293,7 +376,6 @@ int main(int argc, char ** argv)
|
||||
|
||||
testing::InitGoogleTest(&argc, argv);
|
||||
ret=RUN_ALL_TESTS();
|
||||
|
||||
if(data1 != NULL)
|
||||
{
|
||||
cJSON_Delete(data1);
|
||||
@@ -302,7 +384,6 @@ int main(int argc, char ** argv)
|
||||
{
|
||||
cJSON_Delete(data2);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user