From be5d1577331dcd35f4930edaf6f0df9931ee08ff Mon Sep 17 00:00:00 2001 From: liuwentan Date: Thu, 16 Feb 2023 17:45:18 +0800 Subject: [PATCH] generate rpm package --- CMakeLists.txt | 15 +++++++-- cmake/Package.cmake | 57 ++++++++++++++++++++++++++++++++++ cmake/Version.cmake | 54 ++++++++++++++++++++++++++++++++ cmake/changelog.sh | 6 ++++ src/CMakeLists.txt | 3 ++ src/maat_port_proto.c | 14 ++++----- test/maat_framework_gtest.cpp | 58 +++++++++++++++++++++++++++++++++++ 7 files changed, 198 insertions(+), 9 deletions(-) create mode 100644 cmake/Package.cmake create mode 100644 cmake/Version.cmake create mode 100644 cmake/changelog.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 53adfcf..8ef6a91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,16 @@ -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 2.8) +set(lib_name maatframe) project(maatframe) +set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +include(Version) + +SET(CMAKE_INSTALL_PREFIX /opt/MESA/) + +LINK_DIRECTORIES(/opt/MESA/lib /usr/lib64) + include_directories(${PROJECT_SOURCE_DIR}/include) +include_directories(/opt/MESA/include/) set(CMAKE_C_FLAGS "-std=gnu99 -fgnu89-inline -fPIC -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall") @@ -15,4 +24,6 @@ add_subdirectory(vendor) add_subdirectory(src) add_subdirectory(test) add_subdirectory(tools) -add_subdirectory(scanner) \ No newline at end of file +add_subdirectory(scanner) + +include(Package) \ No newline at end of file diff --git a/cmake/Package.cmake b/cmake/Package.cmake new file mode 100644 index 0000000..e112c59 --- /dev/null +++ b/cmake/Package.cmake @@ -0,0 +1,57 @@ +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(MY_RPM_NAME_PREFIX "lib${lib_name}-debug") +else() + set(MY_RPM_NAME_PREFIX "lib${lib_name}") +endif() + +message(STATUS "Package: ${MY_RPM_NAME_PREFIX}") + +set(CPACK_PACKAGE_VECDOR "MESA") +set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}") +set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) +set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}") + +execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) +SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt) + +# RPM Build +set(CPACK_GENERATOR "RPM") +set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON) +set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +set(CPACK_RPM_PACKAGE_VENDOR "MESA") +set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes") +set(CPACK_RPM_PACKAGE_RELEASE_DIST "on") +set(CPACK_RPM_DEBUGINFO_PACKAGE "on") + +set(CPACK_RPM_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_IGNORE_GROUPS 1) +set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) +set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") + +set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE) +set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) +set(CPACK_COMPONENT_LIBRARIES_GROUP "LIBRARIES") + +set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) +set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") +set(CPACK_COMPONENT_HEADER_GROUP "HEADER") + +set(CPACK_COMPONENT_TOOLS_REQUIRED TRUE) +set(CPACK_RPM_TOOLS_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-tools") +set(CPACK_COMPONENT_TOOLS_GROUP "TOOLS") + +set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME}) +set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME}) + +set(CPACK_COMPONENTS_ALL LIBRARIES HEADER TOOLS) + + +set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") + +# Must uninstall the debug package before install release package +set(CPACK_RPM_PACKAGE_CONFLICTS ${MY_RPM_NAME_PREFIX}) + +# set(CPACK_STRIP_FILES TRUE) +include(CPack) diff --git a/cmake/Version.cmake b/cmake/Version.cmake new file mode 100644 index 0000000..a47944c --- /dev/null +++ b/cmake/Version.cmake @@ -0,0 +1,54 @@ + +# Using autorevision.sh to generate version information + +set(__SOURCE_AUTORESIVISION ${CMAKE_SOURCE_DIR}/autorevision.sh) +set(__AUTORESIVISION ${CMAKE_BINARY_DIR}/autorevision.sh) +set(__VERSION_CACHE ${CMAKE_BINARY_DIR}/version.txt) +set(__VERSION_CONFIG ${CMAKE_BINARY_DIR}/version.cmake) + +file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR} + FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) + +# execute autorevision.sh to generate version information +execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} + OUTPUT_FILE ${__VERSION_CONFIG} ERROR_QUIET) +include(${__VERSION_CONFIG}) + +# extract major, minor, patch version from git tag +string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" VERSION_MAJOR "${VCS_TAG}") +string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${VCS_TAG}") +string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${VCS_TAG}") +string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}") + +if(VERSION_DAILY_BUILD) + set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE}) +endif() + +if(NOT VERSION_MAJOR) + set(VERSION_MAJOR 1) +endif() + +if(NOT VERSION_MINOR) + set(VERSION_MINOR 0) +endif() + +if(NOT VERSION_PATCH) + set(VERSION_PATCH 0) +endif() + +set(VERSION "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}") +set(VERSION_BUILD "${VCS_SHORT_HASH}") + +# print information +message(STATUS "Version: ${VERSION}-${VERSION_BUILD}") + +option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE) + +if(DEFINE_GIT_VERSION) + set(GIT_VERSION + "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}") + string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION}) + + add_definitions(-DGIT_VERSION=${GIT_VERSION}) +endif() diff --git a/cmake/changelog.sh b/cmake/changelog.sh new file mode 100644 index 0000000..9e5a277 --- /dev/null +++ b/cmake/changelog.sh @@ -0,0 +1,6 @@ +#!/bin/sh +work_path=$1 +branch=`git status | grep branch | awk '{print $NF}'` +git log --branches=$branch --no-merges --date=local --show-signature --pretty="** %cd %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' | sed 's/\*/ -/g' | sed 's/ - -/\*/g' > $work_path/changelog.txt + +#git log --branches=$branch --no-merges --date=local --show-signature --pretty="** %cd %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bf591c..ee02fb8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,6 +7,8 @@ set(MAAT_FRAME_VERSION ${MAAT_FRAME_MAJOR_VERSION}.${MAAT_FRAME_MINOR_VERSION}.$ message(STATUS "Maat Frame, Version: ${MAAT_FRAME_VERSION}") +LINK_DIRECTORIES(/opt/MESA/lib /usr/lib64) + add_definitions(-D_GNU_SOURCE) add_definitions(-fPIC) set(MAAT_SRC alignment.c json2iris.c maat_api.c rcu_hash.c maat_garbage_collection.c maat_config_monitor.c @@ -18,6 +20,7 @@ set(MAAT_SRC alignment.c json2iris.c maat_api.c rcu_hash.c maat_garbage_collecti set(LIB_SOURCE_FILES ${PROJECT_SOURCE_DIR}/deps/cJSON/cJSON.c ${PROJECT_SOURCE_DIR}/deps/log/log.c) +include_directories(/opt/MESA/include/MESA/) include_directories(${PROJECT_SOURCE_DIR}/include/) include_directories(${PROJECT_SOURCE_DIR}/deps/) include_directories(${PROJECT_SOURCE_DIR}/scanner) diff --git a/src/maat_port_proto.c b/src/maat_port_proto.c index 1152bca..31196cc 100644 --- a/src/maat_port_proto.c +++ b/src/maat_port_proto.c @@ -14,7 +14,7 @@ void *pp_schema_new(cJSON *json, struct table_manager *tbl_mgr, const char *table_name, struct log_handle *logger) { - + return NULL; } void pp_schema_free(void *pp_schema) @@ -27,7 +27,7 @@ void *pp_runtime_new(void *pp_schema, int max_thread_num, struct maat_garbage_bin *garbage_bin, struct log_handle *logger) { - + return NULL; } void pp_runtime_free(void *pp_runtime) @@ -38,24 +38,24 @@ void pp_runtime_free(void *pp_runtime) int pp_runtime_update(void *pp_runtime, void *pp_schema, const char *line, int valid_column) { - + return 0; } int pp_runtime_commit(void *pp_runtime, const char *table_name) { - + return 0; } struct ex_data_runtime *pp_runtime_get_ex_data_rt(struct pp_runtime *pp_rt) { - + return NULL; } int pp_runtime_scan(struct pp_runtime *pp_rt, int thread_id, int port, int proto, int *group_ids, size_t group_id_size, int vtable_id, struct maat_state *state) { - + return 0; } void pp_runtime_scan_hit_inc(struct pp_runtime *pp_rt, int thread_id) @@ -65,5 +65,5 @@ void pp_runtime_scan_hit_inc(struct pp_runtime *pp_rt, int thread_id) long long pp_runtime_scan_hit_sum(struct pp_runtime *pp_rt, int n_thread) { - + return 0; } \ No newline at end of file diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp index 8a790e2..a1a60a3 100644 --- a/test/maat_framework_gtest.cpp +++ b/test/maat_framework_gtest.cpp @@ -631,6 +631,64 @@ TEST_F(MaatIntervalScan, IntervalPlus) { maat_state_free(&state); } +class NOTLogic : public testing::Test +{ +protected: + static void SetUpTestCase() { + + } + + static void TearDownTestCase() { + + } +}; + +TEST_F(NOTLogic, ScanNotAtLast) { + const char *string_should_hit = "This string ONLY contains must-contained-string-of-rule-144."; + const char *string_should_not_hit = "This string contains both must-contained-string-of-rule-144 and must-not-contained-string-of-rule-144."; + + int results[ARRAY_SIZE] = {0}; + size_t n_hit_result = 0; + struct maat_state *state = NULL; + const char *hit_table_name = "HTTP_URL_LITERAL"; + const char *not_hit_table_name = "KEYWORDS_TABLE"; + + int hit_table_id = maat_table_get_id(g_maat_instance, hit_table_name); + ASSERT_GT(hit_table_id, 0); + + int ret = maat_scan_string(g_maat_instance, hit_table_id, 0, string_should_hit, strlen(string_should_hit), + results, ARRAY_SIZE, &n_hit_result, &state); + + EXPECT_EQ(ret, MAAT_SCAN_HIT); + EXPECT_EQ(n_hit_result, 1); + EXPECT_EQ(results[0], 144); + + int not_hit_table_id = maat_table_get_id(g_maat_instance, not_hit_table_name); + ASSERT_GT(not_hit_table_id, 0); + + maat_state_set_last_scan(g_maat_instance, &state); + ret = maat_scan_string(g_maat_instance, not_hit_table_id, 0, string_should_not_hit, strlen(string_should_not_hit), + results, ARRAY_SIZE, &n_hit_result, &state); + EXPECT_EQ(ret, MAAT_SCAN_HALF_HIT); + maat_state_free(&state); +} + +class PluginTable : public testing::Test +{ +protected: + static void SetUpTestCase() { + + } + + static void TearDownTestCase() { + + } +}; + +TEST_F(PluginTable, Callback) { + +} + int count_line_num_cb(const char *table_name, const char *line, void *u_para) { (*((unsigned int *)u_para))++;