Merge branch 'master' into anilm3/v2

DataDog · Jul 26, 2024 · 5b55da7 · 5b55da7
2 parents 864872f + 1a67a2b
commit 5b55da7
Show file tree

Hide file tree

Showing 513 changed files with 10,177 additions and 544 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,7 +54,7 @@ jobs:
             ${{ github.workspace }}/packages/*.sha256
 
   macos-build:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
         with:
@@ -87,7 +87,7 @@ jobs:
             ${{ github.workspace }}/packages/*.sha256
 
   macos-cross-build:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
       - uses: actions/checkout@v4
         with:
@@ -117,7 +117,7 @@ jobs:
             ${{ github.workspace }}/packages/*.sha256
 
   macos-universal-package:
-    runs-on: macos-11
+    runs-on: macos-12
     needs: [macos-build, macos-cross-build]
     steps:
       - uses: actions/checkout@v4
@@ -216,50 +216,40 @@ jobs:
             qemu_action_arch: amd64
             platform: linux/amd64
             package: libddwaf-x86_64-linux-musl
-            runner: ubuntu-latest
           - name: i386
             arch: i386
             qemu_action_arch: i386
             platform: linux/386
             package: libddwaf-i386-linux-musl
-            runner: ubuntu-latest
           - name: aarch64
             arch: aarch64
             qemu_action_arch: arm64
             platform: linux/arm64
             package: libddwaf-aarch64-linux-musl
-            runner: arm-4core-linux
           - name: armv7
             arch: armv7
             qemu_action_arch: arm
             platform: linux/arm/v7
             package: libddwaf-armv7-linux-musl
-            runner: arm-4core-linux
-    runs-on: ${{ matrix.target.runner }}
+    runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux-arm-limited' }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: docker/setup-buildx-action@v3
-        if: matrix.target.runner == 'ubuntu-latest'
         id: buildx
         with:
           install: true
-      - name: Install docker
-        if: matrix.target.runner == 'arm-4core-linux'
-        run: |
-          curl -fsSL https://get.docker.com -o get-docker.sh
-          sudo sh get-docker.sh
-      - run: sudo docker build --progress=plain --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/build/Dockerfile -o packages .
+      - run: docker build --progress=plain --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/build/Dockerfile -o packages .
       - name: Smoketest musl (gcc)
-        run: sudo docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/musl/Dockerfile  .
+        run: docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/musl/Dockerfile  .
       - name: Smoketest musl (clang)
-        run: sudo docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/musl_llvm/Dockerfile  .
+        run: docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/musl_llvm/Dockerfile  .
       - name: Smoketest gnu (gcc)
-        run: sudo docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/gnu/Dockerfile  .
+        run: docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/gnu/Dockerfile  .
       - name: Smoketest gnu rhel 6 (gcc)
         if: matrix.target.qemu_action_arch == 'amd64'
-        run: sudo docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/gnu_rhel6/Dockerfile  .
+        run: docker build --progress=plain --platform ${{ matrix.target.platform }} --build-arg "ARCH=${{ matrix.target.arch }}" -f docker/libddwaf/smoketest/gnu_rhel6/Dockerfile  .
       - name: Generate Package sha256
         working-directory: packages
         run: for file in *.tar.gz; do sha256sum "$file" > "$file.sha256"; done

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -86,6 +86,20 @@ jobs:
             params: "--dialect=sqlite"
           - fuzzer: sqli_detector
             params: "--dialect=standard"
+          - fuzzer: shell_tokenizer
+            params: ""
+          - fuzzer: shi_detector
+            params: ""
+          - fuzzer: sha256
+            params: ""
+          - fuzzer: http_endpoint_fingerprint
+            params: ""
+          - fuzzer: http_header_fingerprint
+            params: ""
+          - fuzzer: http_network_fingerprint
+            params: ""
+          - fuzzer: session_fingerprint
+            params: ""
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
         arch:
           - amd64
           - arm64
-    runs-on: ${{  matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux' }}
+    runs-on: ${{  matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux-arm-limited' }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -78,7 +78,7 @@ jobs:
         arch:
           - amd64
           - arm64
-    runs-on: ${{  matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux' }}
+    runs-on: ${{  matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux-arm-limited' }}
 
     steps:
       - uses: actions/checkout@v4
@@ -123,7 +123,7 @@ jobs:
         arch:
           - amd64
           - arm64
-    runs-on: ${{  matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux' }}
+    runs-on: ${{  matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux-arm-limited' }}
 
     steps:
       - uses: actions/checkout@v4