Build fixes/support for C++ in appsec

Author: cataphract

appsec/cmake/boost.cmake

@@ -19,31 +19,31 @@ set(BOOST_COMPONENTS
 
 function(calculate_abi_hash OUT_HASH)
     set(ABI_COMPONENTS "")
-    
+
     list(APPEND ABI_COMPONENTS "${CMAKE_CXX_COMPILER_ID}")
-    
+
     list(APPEND ABI_COMPONENTS "${CMAKE_SYSTEM_PROCESSOR}")
     list(APPEND ABI_COMPONENTS "${CMAKE_SIZEOF_VOID_P}")
-    
+
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         list(APPEND ABI_COMPONENTS "debug")
     else()
         list(APPEND ABI_COMPONENTS "release")
     endif()
-    
+
     # Relevant compiler flags that might affect the ABI
     string(REGEX MATCHALL "-m[a-zA-Z0-9_-]+" MARCH_FLAGS "${CMAKE_CXX_FLAGS}")
     string(REGEX MATCHALL "-f[a-zA-Z0-9_-]+" FEATURE_FLAGS "${CMAKE_CXX_FLAGS}")
     string(REGEX MATCHALL "-std=[a-zA-Z0-9_+-]+" STD_FLAGS "${CMAKE_CXX_FLAGS}")
     string(REGEX MATCHALL "-D[a-zA-Z0-9_=]+" DEFINE_FLAGS "${CMAKE_CXX_FLAGS}")
     string(REGEX MATCHALL "-stdlib=[a-zA-Z0-9_+-]+" STDLIB_FLAGS "${CMAKE_CXX_FLAGS}")
-    
+
     list(APPEND ABI_COMPONENTS ${MARCH_FLAGS})
     list(APPEND ABI_COMPONENTS ${FEATURE_FLAGS})
     list(APPEND ABI_COMPONENTS ${STD_FLAGS})
     list(APPEND ABI_COMPONENTS ${DEFINE_FLAGS})
     list(APPEND ABI_COMPONENTS ${STDLIB_FLAGS})
-    
+
     # Platform-specific ABI settings
     if(WIN32)
         list(APPEND ABI_COMPONENTS "WIN32")
@@ -61,13 +61,13 @@ function(calculate_abi_hash OUT_HASH)
     else()
         list(APPEND ABI_COMPONENTS "UNIX")
     endif()
-    
+
     list(APPEND ABI_COMPONENTS "${BOOST_VERSION}")
-    
+
     string(JOIN ";" ABI_STRING ${ABI_COMPONENTS})
     string(SHA256 HASH_VALUE "${ABI_STRING}")
     string(SUBSTRING "${HASH_VALUE}" 0 12 SHORT_HASH)
-    
+
     set(${OUT_HASH} "${SHORT_HASH}" PARENT_SCOPE)
 endfunction()
 
@@ -88,7 +88,7 @@ if(EXISTS "${BOOST_BUILD_DIR}/lib" AND EXISTS "${BOOST_BUILD_DIR}/include")
             break()
         endif()
     endforeach()
-    
+
     if(ALL_LIBS_EXIST)
         set(BOOST_ALREADY_BUILT TRUE)
         message(STATUS "Found cached Boost build, skipping compilation")
@@ -199,10 +199,10 @@ endif()
 function(create_boost_target component_name)
     set(LIB_PREFIX "lib")
     set(LIB_SUFFIX ".a")
-    
+
     # Construct the expected library path
     set(EXPECTED_LIB_PATH "${BOOST_BUILD_DIR}/lib/${LIB_PREFIX}boost_${component_name}${LIB_SUFFIX}")
-    
+
     # Don't use an imported library, as it's not available at configuration time
     add_library(boost_${component_name} INTERFACE)
     message(STATUS "boost_${component_name} will be imported from ${EXPECTED_LIB_PATH}")
@@ -212,9 +212,9 @@ function(create_boost_target component_name)
     target_include_directories(boost_${component_name} INTERFACE
         $<BUILD_INTERFACE:${BOOST_BUILD_DIR}/include>
     )
-    
+
     add_dependencies(boost_${component_name} boost_build)
-    
+
     # Set up component-specific dependencies
     if(component_name STREQUAL "coroutine")
         target_link_libraries(boost_${component_name} INTERFACE boost_context boost_system)
@@ -242,8 +242,15 @@ foreach(component IN LISTS BOOST_COMPONENTS)
         create_boost_target("stacktrace_basic")
 
         if (UNIX AND NOT APPLE AND BOOST_TOOLSET STREQUAL "gcc")
-            create_boost_target("stacktrace_backtrace")
-            target_link_libraries(boost_stacktrace INTERFACE boost_stacktrace_backtrace)
+            find_library(BACKTRACE_LIBRARY NAMES backtrace)
+            if (BACKTRACE_LIBRARY)
+                message(STATUS "libbacktrace found: ${BACKTRACE_LIBRARY}")
+                create_boost_target("stacktrace_backtrace")
+                target_link_libraries(boost_stacktrace INTERFACE boost_stacktrace_backtrace)
+            else()
+                message(STATUS "libbacktrace not found, using stacktrace_addr2line instead")
+                target_link_libraries(boost_stacktrace INTERFACE boost_stacktrace_addr2line)
+            endif()
         else()
             target_link_libraries(boost_stacktrace INTERFACE boost_stacktrace_basic)
         endif()

appsec/cmake/clang-format.cmake

@@ -12,7 +12,7 @@ if(DD_APPSEC_BUILD_HELPER)
 endif()
 
 if(DD_APPSEC_BUILD_EXTENSION)
-    file(GLOB_RECURSE EXTENSION_FILES ${EXT_SOURCE_DIR}/*.c tests/helper/*.h tests/bench_helper/*.cc)
+    file(GLOB_RECURSE EXTENSION_FILES ${EXT_SOURCE_DIR}/*.c ${EXT_SOURCE_DIR}/*.cpp tests/helper/*.h tests/bench_helper/*.cc)
     list(APPEND FILE_LIST ${EXTENSION_FILES})
 endif()
 

appsec/cmake/ddtrace.cmake

@@ -100,6 +100,7 @@ if (PhpConfig_VERNUM GREATER_EQUAL 80000)
 else() # PHP 7
     list(REMOVE_ITEM FILES_DDTRACE "${CMAKE_SOURCE_DIR}/../ext/handlers_curl.c"
         "${CMAKE_SOURCE_DIR}/../ext/hook/uhook_attributes.c"
+        "${CMAKE_SOURCE_DIR}/../ext/hook/uhook_otel.c"
         "${CMAKE_SOURCE_DIR}/../zend_abstract_interface/interceptor/php8/interceptor.c"
         "${CMAKE_SOURCE_DIR}/../zend_abstract_interface/interceptor/php8/resolver.c"
         "${CMAKE_SOURCE_DIR}/../zend_abstract_interface/interceptor/php8/resolver_pre-8_2.c"
@@ -120,6 +121,8 @@ list(REMOVE_ITEM FILES_DDTRACE "${CMAKE_SOURCE_DIR}/../ext/crashtracking_windows
 find_package(CURL REQUIRED)
 message(STATUS "CURL version: ${CURL_VERSION_STRING}")
 
+include(cmake/pcre2.cmake)
+
 add_library(ddtrace SHARED ${FILES_DDTRACE})
 set_target_properties(ddtrace PROPERTIES
     C_VISIBILITY_PRESET hidden
@@ -135,7 +138,7 @@ elseif(APPLE)
 else()
     message(FATAL_ERROR "Only Linux and Apple supported")
 endif()
-target_link_libraries(ddtrace PRIVATE PhpConfig components_rs ${CURL_LIBRARIES})
+target_link_libraries(ddtrace PRIVATE PhpConfig components_rs ${CURL_LIBRARIES} PCRE2::pcre2)
 if(CURL_DEFINITIONS)
     target_compile_definitions(ddtrace PRIVATE ${CURL_DEFINITIONS})
 endif()

appsec/cmake/ext_asan.cmake

@@ -16,7 +16,7 @@ endif()
 
 if(ENABLE_ASAN)
     message(STATUS "Enabling ASAN")
-    target_compile_options(PhpConfig INTERFACE -fsanitize=address)
+    target_compile_options(PhpConfig INTERFACE -fsanitize=address -fno-omit-frame-pointer -g)
     target_compile_definitions(PhpConfig INTERFACE ZEND_TRACK_ARENA_ALLOC)
     target_link_options(PhpConfig INTERFACE -fsanitize=address)
 else()

appsec/cmake/extension.cmake

@@ -2,17 +2,28 @@ configure_file(src/extension/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/extens
 
 set(EXT_SOURCE_DIR src/extension)
 
+# Create controlled include directory with symlinks to avoid accidentally including
+# unrelated files from the root directory
+set(EXT_ROOT_INCLUDES ${CMAKE_BINARY_DIR}/ext_root_includes)
+file(MAKE_DIRECTORY ${EXT_ROOT_INCLUDES})
+file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/../zend_abstract_interface
+    ${EXT_ROOT_INCLUDES}/zend_abstract_interface SYMBOLIC)
+file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/../components-rs
+    ${EXT_ROOT_INCLUDES}/components-rs SYMBOLIC)
+
 file(GLOB_RECURSE ZAI_SOURCE ../zend_abstract_interface/config/*.c
  ../zend_abstract_interface/json/*.c ../zend_abstract_interface/env/*.c
  ../zend_abstract_interface/zai_string/*.c)
 
 add_library(zai STATIC ${ZAI_SOURCE})
 
 target_link_libraries(zai PRIVATE PhpConfig)
-target_include_directories(zai PUBLIC ../zend_abstract_interface ..)
+target_include_directories(zai PUBLIC ../zend_abstract_interface ${EXT_ROOT_INCLUDES})
 set_target_properties(zai PROPERTIES POSITION_INDEPENDENT_CODE 1)
 
-file(GLOB_RECURSE EXT_SOURCE ${EXT_SOURCE_DIR}/*.c)
+include(cmake/pcre2.cmake)
+
+file(GLOB_RECURSE EXT_SOURCE ${EXT_SOURCE_DIR}/*.c ${EXT_SOURCE_DIR}/*.cpp)
 add_library(extension SHARED ${EXT_SOURCE})
 set_target_properties(extension PROPERTIES
     C_VISIBILITY_PRESET hidden
@@ -30,20 +41,22 @@ if(ZAI_INCLUDE_DIRS)
 endif()
 target_link_libraries(extension PRIVATE zai)
 
-target_link_libraries(extension PRIVATE mpack PhpConfig zai)
-target_include_directories(extension PRIVATE ..)
+target_link_libraries(extension PRIVATE mpack PhpConfig zai rapidjson_appsec PCRE2::pcre2)
+target_include_directories(extension PRIVATE ${EXT_ROOT_INCLUDES})
 
-# we don't have any C++ now, but just so we don't forget in the future...
+# gnu unique prevents shared libraries from being unloaded from memory by dlclose
 check_cxx_compiler_flag("-fno-gnu-unique" COMPILER_HAS_NO_GNU_UNIQUE)
 if(COMPILER_HAS_NO_GNU_UNIQUE)
 target_compile_options(extension PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-gnu-unique>)
 endif()
-target_compile_options(extension PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti -fno-exceptions>)
+target_compile_options(extension PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-std=c++17 -fno-rtti -fno-exceptions>)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
   target_compile_options(extension PRIVATE -Wall)
 else()
-  target_compile_options(extension PRIVATE -Wall -Wextra -pedantic -Werror -Wno-nullability-extension
-    -Wno-gnu-zero-variadic-macro-arguments -Wno-gnu-auto-type -Wno-language-extension-token)
+  target_compile_options(extension PRIVATE -Wall -Wextra $<$<COMPILE_LANGUAGE:C>:-pedantic>
+    -Werror -Wno-nullability-extension -Wno-gnu-zero-variadic-macro-arguments
+    -Wno-gnu-auto-type -Wno-language-extension-token
+    $<$<COMPILE_LANGUAGE:CXX>:-Wno-missing-field-initializers>)
 endif()
 # our thread local variables are only used by ourselves
 target_compile_options(extension PRIVATE -ftls-model=local-dynamic)
@@ -60,6 +73,10 @@ target_linker_flag_conditional(extension "-Wl,--version-script=${CMAKE_CURRENT_S
 target_linker_flag_conditional(extension -flat_namespace "-undefined suppress")
 target_linker_flag_conditional(extension -Wl,-exported_symbol -Wl,_get_module)
 
+if(DD_APPSEC_EXTENSION_STATIC_LIBSTDCXX AND NOT APPLE)
+    target_link_options(extension PRIVATE -static-libstdc++)
+endif()
+
 patch_away_libc(extension)
 
 if(DD_APPSEC_TESTING)

appsec/cmake/helper.cmake

@@ -1,7 +1,8 @@
-configure_file(src/helper/version.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/helper/version.hpp)
+configure_file(src/helper/version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/src/helper/version.hpp)
 
 set(HELPER_SOURCE_DIR src/helper)
 set(HELPER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/helper)
+set(HELPER_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/helper)
 
 file(GLOB_RECURSE HELPER_SOURCE CONFIGURE_DEPENDS
     ${HELPER_SOURCE_DIR}/*.cpp ${HELPER_SOURCE_DIR}/*.c)
@@ -15,6 +16,7 @@ set_target_properties(helper_objects PROPERTIES
     POSITION_INDEPENDENT_CODE 1)
 target_include_directories(helper_objects
     INTERFACE ${HELPER_INCLUDE_DIR}
+    PUBLIC ${HELPER_BUILD_INCLUDE_DIR}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../components-rs
 )
 target_compile_definitions(helper_objects PUBLIC SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE)

appsec/cmake/pcre2.cmake

@@ -0,0 +1,27 @@
+# We don't link against PCRE2; we only need the include path for pcre2.h
+# If PHP has bundled PCRE, the header is already in PHP's include path
+if(NOT TARGET PCRE2::pcre2)
+    include(CheckSymbolExists)
+    set(_PCRE2_SAVED_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
+    set(CMAKE_REQUIRED_INCLUDES ${PhpConfig_INCLUDE_DIRS})
+    check_symbol_exists(HAVE_BUNDLED_PCRE "main/php_config.h" PHP_HAS_BUNDLED_PCRE)
+    set(CMAKE_REQUIRED_INCLUDES ${_PCRE2_SAVED_CMAKE_REQUIRED_INCLUDES})
+    unset(_PCRE2_SAVED_CMAKE_REQUIRED_INCLUDES)
+
+    add_library(PCRE2::pcre2 INTERFACE IMPORTED)
+
+    if(NOT PHP_HAS_BUNDLED_PCRE)
+        find_path(PCRE2_INCLUDE_DIR NAMES pcre2.h
+            HINTS ${PhpConfig_ROOT_DIR}/include ${PhpConfig_INCLUDE_DIRS})
+
+        if(NOT PCRE2_INCLUDE_DIR)
+            message(FATAL_ERROR "Could not find pcre2.h. Set PCRE2_ROOT to specify location.")
+        endif()
+
+        message(STATUS "Found PCRE2 include dir: ${PCRE2_INCLUDE_DIR}")
+        set_target_properties(PCRE2::pcre2 PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${PCRE2_INCLUDE_DIR}")
+    else()
+        message(STATUS "Using PHP's bundled PCRE2")
+    endif()
+endif()

appsec/src/helper/network/proto.hpp

@@ -10,13 +10,13 @@
 #include "../remote_config/settings.hpp"
 #include "../sidecar_settings.hpp"
 #include "../telemetry_settings.hpp"
-#include "../version.hpp"
 #include "msgpack_helpers.hpp"
 #include <msgpack.hpp>
 #include <optional>
 #include <sstream>
 #include <type_traits>
 #include <typeinfo>
+#include <version.hpp>
 
 using stream_packer = msgpack::packer<std::stringstream>;