Merge branch 'master' into anilm3/suspicious-attacker-blocking

DataDog · Nov 23, 2023 · efa41af · efa41af
2 parents 1b55eaa + 9f2205c
commit efa41af
Show file tree

Hide file tree

Showing 49 changed files with 771 additions and 2,517 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -27,7 +27,7 @@ jobs:
         run: |
             set -ex
             mkdir build && cd build
-            cmake .. -DCMAKE_BUILD_TYPE=Release
+            cmake .. -DCMAKE_BUILD_TYPE=Release -DLIBDDWAF_ENABLE_LTO=ON
             VERBOSE=1 make -j benchmark benchcmp
 
       - name: Run Benchmark

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -27,8 +27,8 @@ jobs:
       - name: Install deps
         run: |
           DEBIAN_FRONTEND="noninteractive" sudo apt-get -y remove python3-lldb-14
-          sudo .github/workflows/scripts/llvm.sh 15
-          DEBIAN_FRONTEND="noninteractive" sudo apt-get -y install libfuzzer-15-dev
+          sudo .github/workflows/scripts/llvm.sh 17
+          DEBIAN_FRONTEND="noninteractive" sudo apt-get -y install libfuzzer-17-dev
 
       - name: Build
         run: ./fuzzing/build.sh

diff --git a/.github/workflows/scripts/llvm.sh b/.github/workflows/scripts/llvm.sh
@@ -20,7 +20,7 @@ usage() {
     exit 1;
 }
 
-CURRENT_LLVM_STABLE=16
+CURRENT_LLVM_STABLE=17
 BASE_URL="http://apt.llvm.org"
 
 # Check for required tools
@@ -125,7 +125,8 @@ LLVM_VERSION_PATTERNS[13]="-13"
 LLVM_VERSION_PATTERNS[14]="-14"
 LLVM_VERSION_PATTERNS[15]="-15"
 LLVM_VERSION_PATTERNS[16]="-16"
-LLVM_VERSION_PATTERNS[17]=""
+LLVM_VERSION_PATTERNS[17]="-17"
+LLVM_VERSION_PATTERNS[18]=""
 
 if [ ! ${LLVM_VERSION_PATTERNS[$LLVM_VERSION]+_} ]; then
     echo "This script does not support LLVM version $LLVM_VERSION"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -171,16 +171,16 @@ jobs:
       - name: Install clang-{tidy,format}
         run: |
           DEBIAN_FRONTEND="noninteractive" sudo apt-get -y remove python3-lldb-14
-          sudo .github/workflows/scripts/llvm.sh 15
-          sudo apt-get install -y clang-tidy-15 clang-format-15
+          sudo .github/workflows/scripts/llvm.sh 17
+          sudo apt-get install -y clang-tidy-17 clang-format-17
 
       - name: CMake
         env:
-          CXX: clang++-15
-          CC: clang-15
+          CXX: clang++-17
+          CC: clang-17
         run: |
-          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=/usr/bin/run-clang-tidy-15 \
-            -DCLANG_FORMAT=/usr/bin/clang-format-15
+          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=/usr/bin/run-clang-tidy-17 \
+            -DCLANG_FORMAT=/usr/bin/clang-format-17
         working-directory: Debug
 
       - name: Build