summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml41
-rw-r--r--src/http_decoder.cpp6
-rw-r--r--src/http_decoder_inc.h3
-rw-r--r--test_based_on_stellar/CMakeLists.txt11
-rw-r--r--vendor/sapp-4.3.56.a47b3b5-1.el7.x86_64.rpmbin0 -> 1100804 bytes
-rw-r--r--vendor/sapp-devel-4.3.56.a47b3b5-1.el7.x86_64.rpmbin0 -> 2550704 bytes
-rw-r--r--vendor/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpmbin0 -> 36124 bytes
7 files changed, 47 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94b7255..341acf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,11 @@ variables:
GIT_STRATEGY: "clone"
BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
- INSTALL_DEPENDENCY_LIBRARY: sapp sapp-devel framework_env libMESA_prof_load-devel libasan
+ INSTALL_DEPENDENCY_LIBRARY: sapp-devel framework_env libMESA_prof_load-devel libasan
libMESA_htable-devel libMESA_jump_layer libMESA_jump_layer-devel
libMESA_handle_logger-devel libMESA_field_stat2-devel
libfieldstat3-devel libfieldstat4-devel libbreakpad_mini-devel
- zlib-devel brotli brotli-devel stellar-on-sapp-devel stellar-on-sapp systemd-devel
+ zlib-devel brotli brotli-devel stellar-on-sapp-devel systemd-devel
SYMBOL_TARGET: http_decoder
TEST_NAME: gtest_http_decoder
INSTALL_PREFIX: "/opt/tsg/"
@@ -118,13 +118,29 @@ release_build_for_centos8:
###############################################################################
# test
###############################################################################
-test_in_centos8:
+
+.install_rpm_package: &install_rpm_package
+ - rpm -e sapp || true
+ - rpm -e sapp-devel || true
+ - rpm -e stellar-on-sapp || true
+ - rpm -e stellar-on-sapp-devel || true
+ - rpm -ivh /tmp/sapp.x86_64.rpm --prefix=${INSTALL_PREFIX}/sapp --force --nodeps
+ - rpm -ivh /tmp/sapp-devel.x86_64.rpm --prefix=${INSTALL_PREFIX}/sapp --force --nodeps
+ - rpm -ivh /tmp/stellar-on-sapp.x86_64.rpm --prefix=${INSTALL_PREFIX} --force --nodeps
+ - rpm -qa | grep sapp
+ - rpm -qa | grep stellar-on-sapp
+ - ls -l /opt/MESA/lib && echo "/opt/MESA/lib" >> /etc/ld.so.conf
+
+history_version_test:
stage: test
image: $BUILD_IMAGE_CENTOS8
allow_failure: false
script:
- *everything_before_script
- - ls -l /opt/MESA/lib && echo "/opt/MESA/lib" >> /etc/ld.so.conf
+ - mv -f ./vendor/stellar-on-sapp*.rpm /tmp/stellar-on-sapp.x86_64.rpm
+ - mv -f ./vendor/sapp-devel*.rpm /tmp/sapp-devel.x86_64.rpm
+ - mv -f ./vendor/sapp-4*.rpm /tmp/sapp.x86_64.rpm
+ - *install_rpm_package
- cd build; make test
dependencies:
- develop_build_for_centos8
@@ -132,6 +148,23 @@ test_in_centos8:
tags:
- share
+latest_version_test:
+ stage: test
+ image: $BUILD_IMAGE_CENTOS8
+ allow_failure: false
+ script:
+ - *everything_before_script
+ - yumdownloader stellar-on-sapp sapp-devel sapp
+ - mv stellar-on-sapp*.rpm /tmp/stellar-on-sapp.x86_64.rpm
+ - mv sapp-devel*.rpm /tmp/sapp-devel.x86_64.rpm
+ - mv sapp-4*.rpm /tmp/sapp.x86_64.rpm
+ - *install_rpm_package
+ - cd build; make test
+ dependencies:
+ - develop_build_for_centos8
+ - release_build_for_centos8
+ tags:
+ - share
###############################################################################
# upload
###############################################################################
diff --git a/src/http_decoder.cpp b/src/http_decoder.cpp
index 551b0b0..9b861d9 100644
--- a/src/http_decoder.cpp
+++ b/src/http_decoder.cpp
@@ -545,11 +545,11 @@ extern "C"
if (ret < 0)
{
stellar_session_plugin_dettach_current_session(sess);
- return (void *)"__not_http_session__";
+ return (void *)HTTP_CTX_NOT_HTTP;
}
}
- return (void *)"__fake_http_decoder_ctx__";
+ return (void *)HTTP_CTX_IS_HTTP;
}
void httpd_session_ctx_free_cb(struct session *sess, void *session_ctx, void *plugin_env)
@@ -557,7 +557,7 @@ extern "C"
if(NULL == plugin_env || NULL == session_ctx){
return;
}
- if(strncmp((const char *)session_ctx, "__not_http_session__", strlen("__not_http_session__")) == 0){
+ if(strncmp((const char *)session_ctx, HTTP_CTX_NOT_HTTP, strlen(HTTP_CTX_NOT_HTTP)) == 0){
return;
}
struct http_decoder_env *httpd_env = (struct http_decoder_env *)plugin_env;
diff --git a/src/http_decoder_inc.h b/src/http_decoder_inc.h
index 9b64cad..13f0369 100644
--- a/src/http_decoder_inc.h
+++ b/src/http_decoder_inc.h
@@ -65,6 +65,9 @@ extern "C"
#define HTTPD_CFG_FILE "./etc/http/http_decoder.toml"
#define FILEDSTAT_OUTPUT_FILE "./http_decoder.fs4"
+#define HTTP_CTX_NOT_HTTP "__NOT_HTTP_SESS__"
+#define HTTP_CTX_IS_HTTP "__FAKE_HTTP_CTX__"
+
struct http_decoder_config
{
int decompress_switch;
diff --git a/test_based_on_stellar/CMakeLists.txt b/test_based_on_stellar/CMakeLists.txt
index 3559f10..b3e6871 100644
--- a/test_based_on_stellar/CMakeLists.txt
+++ b/test_based_on_stellar/CMakeLists.txt
@@ -1,8 +1,7 @@
set(DECODER_NAME http_decoder)
-set(TEST_RUN_DIR /home/mesasoft/sapp_run)
-set(SAPP_DEVEL_DIR /home/mesasoft/sapp_run/lib)
-set(STELLAR_ON_SAPP_LIB_DIR /opt/tsg/sapp/plug/stellar_on_sapp)
+set(TEST_RUN_DIR ${CMAKE_INSTALL_PREFIX}/sapp)
+set(SAPP_DEVEL_DIR ${TEST_RUN_DIR}/lib)
set(TEST_MAIN plugin_test_main)
include_directories(${CMAKE_SOURCE_DIR}/include)
@@ -13,6 +12,7 @@ include_directories(/opt/MESA/include/MESA)
#various ways to add -rdynamic for centos7, centos8, and different cmake version
add_definitions(-rdynamic)
+link_directories(${SAPP_DEVEL_DIR})
add_executable(plugin_test_main plugin_test_main.cpp)
set_target_properties(plugin_test_main
PROPERTIES
@@ -25,7 +25,6 @@ set_target_properties(plugin_test_main
"-rdynamic"
)
set(LINK_FLAGS "-rdynamic")
-link_directories(${SAPP_DEVEL_DIR}/lib)
target_link_libraries(plugin_test_main gtest cjson-static sapp_devel pthread pcap MESA_htable MESA_field_stat2 MESA_htable MESA_prof_load MESA_handle_logger MESA_jump_layer breakpad_mini fieldstat3 fieldstat4 systemd )
# assemble test env
@@ -45,13 +44,11 @@ add_test(NAME UPDATE_GTEST_PLUG_ENTRY COMMAND bash -c "sed -i 's/name=.*/name=\\
add_test(NAME UPDATE_GTEST_PLUG_TOPIC COMMAND bash -c "sed -i 's/topic=.*/topic=\\x22HTTP_DECODER_MESSAGE\\x22/' ${TEST_RUN_DIR}/etc/http/gtest_entry.toml")
# update plugin to be tested
-# add_test(NAME STELLAR_ON_SAPP_SO COMMAND sh -c "cp ${STELLAR_ON_SAPP_LIB_DIR}/stellar_on_sapp.so ${TEST_RUN_DIR}/plug/stellar_on_sapp/stellar_on_sapp.so")
-add_test(NAME STELLAR_ON_SAPP_SO COMMAND sh -c "rpm -ql stellar-on-sapp | grep stellar_on_sapp.so | xargs -i cp -f {} ${TEST_RUN_DIR}/plug/stellar_on_sapp/stellar_on_sapp.so")
add_test(NAME STELLAR_HTTP_DECODER_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/src/${DECODER_NAME}.so ${TEST_RUN_DIR}/stellar_plugin/${DECODER_NAME}.so")
add_test(NAME STELLAR_HTTP_DECODER_GTEST_SO COMMAND sh -c "cp ${CMAKE_BINARY_DIR}/test/${DECODER_NAME}_test.so ${TEST_RUN_DIR}/stellar_plugin/${DECODER_NAME}_test.so")
set_tests_properties(STELLAR_INSTALL_TEST_MAIN STELLAR_COPY_SPEC STELLAR_COPY_CONFLIST STELLAR_COPY_START_LOADER_INF STELLAR_COPY_DEFER_LOADER_INF STELLAR_COPY_HTTP_DECODER_CONF STELLAR_COPY_HTTP_GTEST_ENTRY_CONF
- STELLAR_ON_SAPP_SO STELLAR_HTTP_DECODER_SO STELLAR_HTTP_DECODER_GTEST_SO STELLAR_UPDATE_SAPP_LOG_LEVEL STELLAR_UPDATE_SAPP_SYN_MODE STELLAR_ENABLE_SAPP_MONITOR
+ STELLAR_HTTP_DECODER_SO STELLAR_HTTP_DECODER_GTEST_SO STELLAR_UPDATE_SAPP_LOG_LEVEL STELLAR_UPDATE_SAPP_SYN_MODE STELLAR_ENABLE_SAPP_MONITOR
UPDATE_GTEST_PLUG_ENTRY UPDATE_GTEST_PLUG_TOPIC
PROPERTIES FIXTURES_SETUP TestFixture)
diff --git a/vendor/sapp-4.3.56.a47b3b5-1.el7.x86_64.rpm b/vendor/sapp-4.3.56.a47b3b5-1.el7.x86_64.rpm
new file mode 100644
index 0000000..180c341
--- /dev/null
+++ b/vendor/sapp-4.3.56.a47b3b5-1.el7.x86_64.rpm
Binary files differ
diff --git a/vendor/sapp-devel-4.3.56.a47b3b5-1.el7.x86_64.rpm b/vendor/sapp-devel-4.3.56.a47b3b5-1.el7.x86_64.rpm
new file mode 100644
index 0000000..6f331b6
--- /dev/null
+++ b/vendor/sapp-devel-4.3.56.a47b3b5-1.el7.x86_64.rpm
Binary files differ
diff --git a/vendor/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm b/vendor/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm
new file mode 100644
index 0000000..695d6bc
--- /dev/null
+++ b/vendor/stellar-on-sapp-2.1.1.7875675-1.el8.x86_64.rpm
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 19:26:12 +0000