Merge latest master into 11-Dev

There were no conflicts.

Author: bneradt

.gitignore

@@ -170,7 +170,8 @@ rc/trafficserver.service
 .libs/
 
 .svn/
-.vscode/
+.vscode/*
+!.vscode/settings.json
 target
 
 tsxs

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "files.associations": {
+        "*.cript": "cpp",
+        "*.test.py": "python",
         "*.test.ext": "python"
     }
 }
-

CMakeLists.txt

@@ -274,7 +274,6 @@ if(LibLZMA_FOUND)
   set(HAVE_LZMA_H TRUE)
 endif()
 
-find_package(PCRE REQUIRED)
 pkg_check_modules(PCRE2 REQUIRED IMPORTED_TARGET libpcre2-8)
 
 include(CheckOpenSSLIsBoringSSL)
@@ -360,6 +359,33 @@ set(TS_USE_MALLOC_ALLOCATOR ${ENABLE_MALLOC_ALLOCATOR})
 set(TS_USE_ALLOCATOR_METRICS ${ENABLE_ALLOCATOR_METRICS})
 find_package(ZLIB REQUIRED)
 
+find_package(zstd CONFIG QUIET)
+if(zstd_FOUND)
+
+  # Provide a compatibility target name if the upstream package does not export it
+  # Our code links against `zstd::zstd`; upstream zstd usually exports
+  # `zstd::libzstd_shared`/`zstd::libzstd_static`. Create an alias if needed.
+  if(NOT TARGET zstd::zstd)
+    if(TARGET zstd::libzstd_shared)
+      set(_zstd_target zstd::libzstd_shared)
+    elseif(TARGET zstd::libzstd_static)
+      set(_zstd_target zstd::libzstd_static)
+    elseif(TARGET zstd::libzstd)
+      set(_zstd_target zstd::libzstd)
+    endif()
+    if(DEFINED _zstd_target)
+      add_library(zstd_zstd INTERFACE)
+      target_link_libraries(zstd_zstd INTERFACE ${_zstd_target})
+      add_library(zstd::zstd ALIAS zstd_zstd)
+      set(HAVE_ZSTD_H TRUE)
+    else()
+      set(HAVE_ZSTD_H FALSE)
+    endif()
+  endif()
+else()
+  set(HAVE_ZSTD_H FALSE)
+endif()
+
 # ncurses is used in traffic_top
 find_package(Curses)
 set(HAVE_CURSES_H ${CURSES_HAVE_CURSES_H})

README.md

@@ -47,7 +47,7 @@ $ ccmake build
 To specify the location of a dependency (like `--with-*` for autotools builds), you generally set a variable with the `ROOT`. The big exception to this is for openssl. This variable is called `OPENSSL_ROOT_DIR`
 
 ```
-$ cmake -B build -Djemalloc_ROOT=/opt/jemalloc -DPCRE_ROOT=/opt/edge -DOPENSSL_ROOT_DIR=/opt/boringssl
+$ cmake -B build -Djemalloc_ROOT=/opt/jemalloc -DOPENSSL_ROOT_DIR=/opt/boringssl
 ```
 
 #### Using presets to configure the build

ci/coverity-model.cpp

@@ -16,21 +16,15 @@
     limitations under the License.
 */
 
-// This is for PCRE, where the offsets vector is considered uninitialized, but it's an
+// This is for PCRE2, where the offsets vector is considered uninitialized, but it's an
 //  output vector only (input doesn't matter).
 extern "C" {
-#define PCRE_SPTR const char *
-
-struct real_pcre;   /* declaration; the definition is private  */
-typedef struct real_pcre pcre;
-
-typedef struct pcre_extra {
-} pcre_extra;
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 
 int
-pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
-          PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
-          int offsetcount)
+pcre2_match(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length, PCRE2_SIZE startoffset, uint32_t options,
+            pcre2_match_data *match_data, pcre2_match_context *mcontext)
 {
   __coverity_panic__();
 }

ci/docker/deb/Dockerfile

@@ -55,7 +55,8 @@ RUN apt-get update; apt-get -y dist-upgrade; \
     apt-get -y install libssl-dev libexpat1-dev libpcre3-dev libcap-dev \
     libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \
     tcl-dev tcl8.6-dev libjemalloc-dev libluajit-5.1-dev liblzma-dev \
-    libhiredis-dev libbrotli-dev libncurses-dev libgeoip-dev libmagick++-dev; \
+    libhiredis-dev libbrotli-dev libncurses-dev libgeoip-dev libmagick++-dev \
+    libzstd-dev; \
     # Optional: This is for the OpenSSH server, and Jenkins account + access (comment out if not needed)
     apt-get -y install openssh-server openjdk-8-jre && mkdir /run/sshd; \
     groupadd  -g 665 jenkins && \

ci/docker/yum/Dockerfile

@@ -52,7 +52,7 @@ RUN yum -y update; \
     # Devel packages that ATS needs
     yum -y install openssl-devel expat-devel pcre-devel libcap-devel hwloc-devel libunwind-devel \
     xz-devel libcurl-devel ncurses-devel jemalloc-devel GeoIP-devel luajit-devel brotli-devel \
-    ImageMagick-devel ImageMagick-c++-devel hiredis-devel zlib-devel \
+    ImageMagick-devel ImageMagick-c++-devel hiredis-devel zlib-devel zstd-devel \
     perl-ExtUtils-MakeMaker perl-Digest-SHA perl-URI; \
     # This is for autest stuff
     yum -y install python3 httpd-tools procps-ng nmap-ncat pipenv \

cmake/ExperimentalPlugins.cmake

@@ -31,6 +31,7 @@ auto_option(ACCESS_CONTROL FEATURE_VAR BUILD_ACCESS_CONTROL DEFAULT ${_DEFAULT})
 auto_option(BLOCK_ERRORS FEATURE_VAR BUILD_BLOCK_ERRORS DEFAULT ${_DEFAULT})
 auto_option(CACHE_FILL FEATURE_VAR BUILD_CACHE_FILL DEFAULT ${_DEFAULT})
 auto_option(CERT_REPORTING_TOOL FEATURE_VAR BUILD_CERT_REPORTING_TOOL DEFAULT ${_DEFAULT})
+auto_option(CONNECTION_EXEMPT_LIST FEATURE_VAR BUILD_CONNECTION_EXEMPT_LIST DEFAULT ${_DEFAULT})
 auto_option(COOKIE_REMAP FEATURE_VAR BUILD_COOKIE_REMAP DEFAULT ${_DEFAULT})
 auto_option(CUSTOM_REDIRECT FEATURE_VAR BUILD_CUSTOM_REDIRECT DEFAULT ${_DEFAULT})
 auto_option(FQ_PACING FEATURE_VAR BUILD_FQ_PACING DEFAULT ${_DEFAULT})

cmake/FindPCRE.cmake cmake/add_cript.cmakecmake/FindPCRE.cmake renamed to cmake/add_cript.cmake

@@ -15,34 +15,21 @@
 #
 #######################
 
-# FindPCRE.cmake
-#
-# This will define the following variables
-#
-#     PCRE_FOUND
-#     PCRE_LIBRARIES
-#     PCRE_INCLUDE_DIRS
-#
-# and the following imported targets
-#
-#     PCRE::PCRE
-#
-
-find_path(PCRE_INCLUDE_DIR NAMES pcre.h) # PATH_SUFFIXES pcre)
-find_library(PCRE_LIBRARY NAMES pcre)
-
-mark_as_advanced(PCRE_FOUND PCRE_LIBRARY PCRE_INCLUDE_DIR)
+# Function to build pre-compiled cript scripts
+function(add_cript name source_file)
+  # Check if ENABLE_CRIPTS is ON, if not, skip
+  if(NOT ENABLE_CRIPTS)
+    message(STATUS "Skipping cript ${name} - ENABLE_CRIPTS is OFF")
+    return()
+  endif()
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PCRE REQUIRED_VARS PCRE_INCLUDE_DIR PCRE_LIBRARY)
+  # Use the standard ATS plugin macro and link with cripts
+  add_atsplugin(${name} ${source_file})
+  target_link_libraries(${name} PRIVATE ts::cripts)
 
-if(PCRE_FOUND)
-  set(PCRE_INCLUDE_DIRS "${PCRE_INCLUDE_DIR}")
-  set(PCRE_LIBRARIES "${PCRE_LIBRARY}")
-endif()
+  # Tell CMake that .cript files are C++ files
+  set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)
+  set_source_files_properties(${source_file} PROPERTIES LANGUAGE CXX)
 
-if(PCRE_FOUND AND NOT TARGET PCRE::PCRE)
-  add_library(PCRE::PCRE INTERFACE IMPORTED)
-  target_include_directories(PCRE::PCRE INTERFACE ${PCRE_INCLUDE_DIRS})
-  target_link_libraries(PCRE::PCRE INTERFACE "${PCRE_LIBRARY}")
-endif()
+  verify_remap_plugin(${name})
+endfunction()

contrib/docker/ubuntu/noble/Dockerfile

@@ -48,6 +48,8 @@ RUN apt update \
     libpcre3-dev \
     hwloc \
     libbrotli-dev \
+    libzstd-dev \
+    luajit \
     libluajit-5.1-dev \
     libcap-dev \
     libmagick++-dev \