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

修改安装文件路径

Browse Source 
增加日志定时删除功能
修复ip释放内存泄露问题
This commit is contained in:
fengweihao
2020-09-07 18:53:20 +08:00
parent c2bf31aeb1
commit 9e111481ef
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -15,7 +15,7 @@ if(NOT CMAKE_BUILD_TYPE)
endif() endif()
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (CMAKE_INSTALL_PREFIX "/home/tsg/verify-policy" CACHE PATH "default install path" FORCE ) set (CMAKE_INSTALL_PREFIX "/opt/tsg/verify-policy" CACHE PATH "default install path" FORCE )
endif() endif()
# Global compile options # Global compile options
@@ -45,7 +45,7 @@ endif()
add_custom_target("install-program" COMMAND ${CMAKE_COMMAND} ARGS -DCOMPONENT=Program -P cmake_install.cmake) add_custom_target("install-program" COMMAND ${CMAKE_COMMAND} ARGS -DCOMPONENT=Program -P cmake_install.cmake)
add_custom_target("install-profile" COMMAND ${CMAKE_COMMAND} ARGS -DCOMPONENT=Profile -P cmake_install.cmake) add_custom_target("install-profile" COMMAND ${CMAKE_COMMAND} ARGS -DCOMPONENT=Profile -P cmake_install.cmake)
add_custom_target("tarball" COMMAND sh ${CMAKE_SCRIPT_PATH}/tarball.sh ${TARGET_VERSION} ${TARGET_DESCRIBE}) add_custom_target("tarball" COMMAND sh ${CMAKE_SCRIPT_PATH}/tarball/tarball.sh ${TARGET_VERSION} ${TARGET_DESCRIBE})
enable_testing() enable_testing()
#add_subdirectory(conf) #add_subdirectory(conf)

7
cmake/Package.cmake
View File

@@ -22,14 +22,15 @@ set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreInstall.in)
#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in) #set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in) #set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
set(CMAKE_INSTALL_PREFIX "/home/tsg/verify-policy") set(CMAKE_INSTALL_PREFIX "/opt/tsg/verify-policy")
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX /home/tsg) set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX /opt/tsg)
install(PROGRAMS build/platform/verify-policy DESTINATION ./bin) install(PROGRAMS build/platform/verify-policy DESTINATION ./bin)
install(DIRECTORY ./conf DESTINATION ./) install(DIRECTORY ./conf DESTINATION ./)
install(DIRECTORY ./resource DESTINATION ./) install(DIRECTORY ./resource DESTINATION ./)
install(FILES script/verify-policy.service DESTINATION /usr/lib/systemd/system/) install(FILES script/service/verify-policy.service DESTINATION /usr/lib/systemd/system/)
install(FILES script/tmpfiles/verify_policy.conf DESTINATION /usr/lib/tmpfiles.d/)
# Must uninstall the debug package before install release package # Must uninstall the debug package before install release package
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")

3
platform/src/verify_policy.cpp
View File

@@ -320,7 +320,8 @@ cJSON *get_query_from_request(const char *data, int thread_id)
goto free; goto free;
} }
hit_cnt = http_policy_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx); hit_cnt = http_policy_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx);
if(0 == strcasecmp(verify_policy->verify_object[i].attri_name, "ip")) if(0 == strcasecmp(verify_policy->verify_object[i].attri_name, "source") ||
0 == strcasecmp(verify_policy->verify_object[i].attri_name, "destination"))
{ {
ipaddr_free(verify_policy->verify_object[i].ip_addr); ipaddr_free(verify_policy->verify_object[i].ip_addr);
} }

0
script/verify-policy.service → script/service/verify-policy.service
View File

0
script/tarball.sh → script/tarball/tarball.sh
View File

7
script/tmpfiles/verify_policy.conf Normal file
View File

@@ -0,0 +1,7 @@
#Type Path Mode User Group Age Argument
d /var/log/verify-policy/ 0755 - - 7d -
d /run/verify-policy/pangu_files 0755 - - - -
d /run/verify-policy/rulescan_tmp 0755 - - - -
L /opt/tsg/verify-policy/logs - - - - /var/log/verify-policy
L /opt/tsg/verify-policy/pangu_files - - - - /run/verify-policy/pangu_files
L /opt/tsg/verify-policy/rulescan_tmp - - - - /run/verify-policy/rulescan_tmp