libddwaf 1.14.0.0.0 → 1.18.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '058fd59aa02f0d4be3c917d5a01d68c868cb41b77c903ee28d7b2106e5945f02'
-  data.tar.gz: 5dcaa2c486a0de0ca591ca06775d29184b3a8d9f6da539fed1cfa583ad86db9e
+  metadata.gz: 2cea26919b7498876af6b3517e509939b1dfc2bfac538dccf9d4f7d6ba02bb84
+  data.tar.gz: ec604e73b223f59abcc8d001a08f46ea7d130b2ecc9e4f672313b812e91e5016
 SHA512:
-  metadata.gz: 0107d27ac04857784db5e789374a5b370d1afb92ec80cb31ed1289e154665c6216c20cbf7b4dc6a557db3cd14e65ebab38e4d52ed503f14b3c87d91b1869c32b
-  data.tar.gz: 5e7fe5e71a1a570705b5b950010e57b17c8c4bd1976fd7e97f35cc07eb7d0ac193198d52937950f88d609f4722b89551c4f79fe07dba11aaf2ef98cdbe54db07
+  metadata.gz: 706ca9b34d702e244d74b46f2ef5633de09f37b8b8cfa3591e4421417592a9034eeabde5358879a00b113acad38c04a2827418edf8b936f8af3302d8b902bd01
+  data.tar.gz: c4c0f294b8e4d9e173ed775d6b60ecf89ebeb97360dfd67bb6c8049582f5f9d3e5cd7bc3cf179ac319518bef11b38b1bfcb7e740e18281b14c22510ee763dfcc

data/.github/actions/docker-build-ruby/Dockerfile

@@ -0,0 +1,5 @@
+ARG RUBY_VERSION
+
+FROM ruby:${RUBY_VERSION:-2.5}
+
+RUN gem update --system 3.3.27

data/.github/actions/docker-build-ruby/Dockerfile.alpine

@@ -0,0 +1,7 @@
+ARG RUBY_VERSION
+
+FROM ruby:${RUBY_VERSION:-2.5}-alpine
+
+RUN apk add --no-cache build-base git
+
+RUN gem update --system 3.3.27

data/.github/actions/docker-build-ruby/Dockerfile.jruby

@@ -0,0 +1,6 @@
+ARG RUBY_VERSION
+
+FROM jruby:${RUBY_VERSION:-9.2}
+
+RUN apt-get update
+RUN apt-get install -y build-essential git

data/.github/actions/docker-build-ruby/action.yml

@@ -0,0 +1,57 @@
+name: Build docker image
+description:
+  Github Actions does not support setting the platform for the container yet.
+  This action builds the image for the specified architecture and libc.
+
+inputs:
+  ruby-version:
+    description: Ruby version
+    required: true
+
+  arch:
+    description: Build architecture
+    required: true
+
+  libc:
+    description: Which libc is used
+    required: true
+
+  jruby:
+    description: Whether to use JRuby
+    required: false
+    default: "false"
+
+outputs:
+  run-cmd:
+    description: Command to run the container
+    value: ${{ steps.set-run-cmd.outputs.run-cmd }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+      with:
+        platforms: ${{ inputs.arch }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build image
+      uses: docker/build-push-action@v6
+      with:
+        file: .github/actions/docker-build-ruby/Dockerfile${{ inputs.libc == 'musl' && '.alpine' || '' }}${{ inputs.jruby == 'true' && '.jruby' || '' }}
+        build-args: |
+          "RUBY_VERSION=${{ inputs.ruby-version }}"
+        push: false
+        load: true
+        tags: libddwaf-rb-test:latest
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        platforms: linux/${{ inputs.arch }}
+
+    - name: Set run-cmd output
+      id: set-run-cmd
+      shell: bash
+      run: |
+        echo "run-cmd=docker run --platform linux/${{ inputs.arch }} -v gems:/usr/local/bundle -v ${{ github.workspace }}:/libddwaf-rb -w /libddwaf-rb libddwaf-rb-test:latest" >> "$GITHUB_OUTPUT"

data/.github/workflows/lint.yml

@@ -5,29 +5,30 @@ on:
 jobs:
   style-check:
     name: Style check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
-      image: ruby:3.1
+      image: ruby:3.3
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Bundle
-        run: |
-          bundle install
+        run: bundle install
+
       - name: Run Rubocop
-        run: |
-          bundle exec rubocop -D
+        run: bundle exec rubocop -D
+
   type-check:
     name: Type check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     container:
-      image: ruby:3.1
+      image: ruby:3.3
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Bundle
-        run: |
-          bundle install
+        run: bundle install
+
       - name: Run Steep
-        run: |
-          bundle exec steep check
+        run: bundle exec rake steep:check

data/.github/workflows/package.yml

@@ -3,213 +3,132 @@ on:
   - push
 
 jobs:
-  package-ruby:
+  test-rake-build:
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-24.04]
+        ruby: ["3.3"]
+        arch: [amd64, arm64]
+        libc: [gnu]
         include:
-          - os: ubuntu-20.04
-            cpu: x86_64
-            platform: ruby
-    name: Build package (${{ matrix.platform }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Linux build tools
-        if: ${{ startsWith(matrix.os, 'ubuntu-') }}
-        run: sudo apt-get install -y ruby ruby-bundler
-      - name: Bundle
-        run: |
-          bundle install
-      - name: Build gem
-        run: |
-          bundle exec rake build
-      - name: Upload gem
-        uses: actions/upload-artifact@v2
-        with:
-          name: libddwaf-${{ matrix.platform }}-${{ github.run_id }}-${{ github.sha }}
-          path: pkg
-  package-binary:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-            cpu: x86_64
-            platform: x86_64-linux:llvm
-            artifact: x86_64-linux-llvm
-          - os: ubuntu-20.04
-            cpu: aarch64
-            platform: aarch64-linux:llvm
-            artifact: aarch64-linux-llvm
-          - os: ubuntu-20.04
-            cpu: universal
-            platform: java
-            artifact: java
-          - os: macos-12
-            cpu: x86_64
-            platform: x86_64-darwin
-            artifact: x86_64-darwin
-          - os: macos-12
-            cpu: arm64
-            platform: arm64-darwin
-            artifact: arm64-darwin
-    name: Build package (${{ matrix.platform }})
+          - arch: amd64
+            platform: x86_64-linux
+          - arch: arm64
+            platform: aarch64-linux
+
+    name: Test build without fetching libddwaf (Ruby ${{ matrix.ruby }}, ${{ matrix.arch }}, ${{ matrix.libc }})
     runs-on: ${{ matrix.os }}
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Linux build tools
-        if: ${{ startsWith(matrix.os, 'ubuntu-') }}
-        run: sudo apt-get install -y ruby ruby-bundler
-      - name: Bundle
-        run: |
-          bundle install
-      - name: Build binary gem
-        run: |
-          bundle exec rake binary[${{ matrix.platform }}]
-      - name: Upload gem
-        uses: actions/upload-artifact@v2
-        with:
-          name: libddwaf-${{ matrix.artifact }}-${{ github.run_id }}-${{ github.sha }}
-          path: pkg
-  test-ruby:
-    needs: package-ruby
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-            cpu: x86_64
-            platform: ruby
-            image: ruby:2.6
-            qemu: amd64
-            libc: gnu
-    name: Test package (${{ matrix.platform }}-${{ matrix.libc }})
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Enable ${{ matrix.qemu }} platform
-        id: qemu
-        if: ${{ matrix.cpu != 'amd64' }}
-        run: |
-          docker run --privileged --rm tonistiigi/binfmt:latest --install ${{ matrix.qemu }} | tee platforms.json
-          echo "::set-output name=platforms::$(cat platforms.json)"
-      - name: Start container
-        id: container
-        run: |
-          echo ${{ matrix.image }} > container_image
-          docker run --rm -d -v "${PWD}":"${PWD}" -w "${PWD}" --platform linux/${{ matrix.qemu }} ${{ matrix.image }} /bin/sleep 64d | tee container_id
-          docker exec -w "${PWD}" $(cat container_id) uname -a
-          echo "::set-output name=id::$(cat container_id)"
-      - uses: actions/download-artifact@v2
+        uses: actions/checkout@v4
+
+      - name: Build docker image
+        id: build-image
+        uses: ./.github/actions/docker-build-ruby
         with:
-          name: libddwaf-${{ matrix.platform }}-${{ github.run_id }}-${{ github.sha }}
-          path: pkg
+          ruby-version: ${{ matrix.ruby }}
+          arch: ${{ matrix.arch }}
+          libc: ${{ matrix.libc }}
+
+      - name: Bundle install
+        run: ${{ steps.build-image.outputs.run-cmd }} bundle install
+
+      - name: Build gem
+        run: ${{ steps.build-image.outputs.run-cmd }} bundle exec rake build
+
       - name: List artifact files
         run: find .
         working-directory: pkg
+
       - name: Install gem
-        run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install --verbose pkg/*.gem
+        run: ${{ steps.build-image.outputs.run-cmd }} gem install --verbose pkg/*.gem
+
       - name: Run smoke test
-        run: |
-          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} ruby -e 'begin require "libddwaf"; rescue LoadError => e; puts e.message; else fail "loaded when it should not"; end'
-  test-linux:
-    needs: package-binary
+        run: ${{ steps.build-image.outputs.run-cmd }} ruby -e 'begin require "libddwaf"; rescue LoadError => e; puts e.message; else fail "loaded when it should not"; end'
+
+  test-rake-binary:
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-24.04]
+        ruby: ["3.3", "9.4"]
+        arch: [amd64, arm64]
+        libc: [gnu, musl]
         include:
-          - os: ubuntu-20.04
-            cpu: x86_64
-            platform: x86_64-linux
-            artifact: x86_64-linux-llvm
-            image: ruby:2.6
-            qemu: amd64
-            libc: gnu
-          - os: ubuntu-20.04
-            cpu: aarch64
-            platform: aarch64-linux
-            artifact: aarch64-linux-llvm
-            image: ruby:2.6
-            qemu: aarch64
-            libc: gnu
-          - os: ubuntu-20.04
-            cpu: x86_64
-            platform: x86_64-linux
-            artifact: x86_64-linux-llvm
-            image: ruby:2.6-alpine
-            qemu: amd64
-            libc: musl
-          - os: ubuntu-20.04
-            cpu: aarch64
-            platform: aarch64-linux
-            artifact: aarch64-linux-llvm
-            image: ruby:2.6-alpine
-            qemu: aarch64
+          - arch: amd64
+            platform: x86_64-linux:llvm
+          - arch: arm64
+            platform: aarch64-linux:llvm
+          - ruby: 3.3
+            jruby: false
+          - ruby: 9.4
+            jruby: true
+        exclude:
+          - ruby: 9.4
             libc: musl
-          - os: ubuntu-20.04
-            cpu: x86_64
-            platform: java
-            artifact: java
-            image: jruby:9.3.0.0
-            qemu: amd64
-            libc: gnu
-    name: Test package (${{ matrix.platform }}, ${{ matrix.libc }}, ${{ matrix.cpu }})
+
+    name: Test gem build (${{ matrix.jruby == true && 'Jruby' || 'Ruby'}} ${{ matrix.ruby }}, ${{ matrix.arch }}, ${{ matrix.libc }})
     runs-on: ${{ matrix.os }}
+
     steps:
-      - name: Enable ${{ matrix.qemu }} platform
-        id: qemu
-        if: ${{ matrix.cpu != 'amd64' }}
-        run: |
-          docker run --privileged --rm tonistiigi/binfmt:latest --install ${{ matrix.qemu }} | tee platforms.json
-          echo "::set-output name=platforms::$(cat platforms.json)"
-      - name: Start container
-        id: container
-        run: |
-          echo ${{ matrix.image }} > container_image
-          docker run --rm -d -v "${PWD}":"${PWD}" -w "${PWD}" --platform linux/${{ matrix.qemu }} ${{ matrix.image }} /bin/sleep 64d | tee container_id
-          docker exec -w "${PWD}" $(cat container_id) uname -a
-          echo "::set-output name=id::$(cat container_id)"
-      - uses: actions/download-artifact@v2
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build docker image
+        id: build-image
+        uses: ./.github/actions/docker-build-ruby
         with:
-          name: libddwaf-${{ matrix.artifact }}-${{ github.run_id }}-${{ github.sha }}
-          path: pkg
+          ruby-version: ${{ matrix.ruby }}
+          arch: ${{ matrix.arch }}
+          libc: ${{ matrix.libc }}
+          jruby: ${{ matrix.jruby }}
+
+      - name: Bundle install
+        run: ${{ steps.build-image.outputs.run-cmd }} bundle install
+
+      - name: Build binary gem
+        run: ${{ steps.build-image.outputs.run-cmd }} bundle exec rake binary[${{ matrix.platform }}]
+
       - name: List artifact files
         run: find .
         working-directory: pkg
-      - name: Install Alpine system dependencies
-        if: ${{ matrix.libc == 'musl' }}
-        run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base
+
       - name: Install gem
-        run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} gem install --verbose pkg/*.gem
+        run: ${{ steps.build-image.outputs.run-cmd }} gem install --verbose pkg/*.gem
+
       - name: Run smoke test
-        run: |
-          docker exec -w "${PWD}" ${{ steps.container.outputs.id }} ruby -r 'libddwaf' -e 'p Datadog::AppSec::WAF::LibDDWAF.ddwaf_get_version'
-  test-darwin:
-    needs: package-binary
+        run: ${{ steps.build-image.outputs.run-cmd }} ruby -r 'libddwaf' -e 'p Datadog::AppSec::WAF::LibDDWAF.ddwaf_get_version'
+
+  test-rake-binary-on-darwin:
     strategy:
       fail-fast: false
       matrix:
+        os: [macos-15, macos-15-large]
         include:
-          - os: macos-12
-            cpu: x86_64
+          - os: macos-15
+            platform: arm64-darwin
+          - os: macos-15-large
             platform: x86_64-darwin
-        # - os: macos-12
-        #   cpu: arm64
-        #   platform: arm64-darwin
-    name: Test package (${{ matrix.platform }})
+
+    name: Test gem build (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: libddwaf-${{ matrix.platform }}-${{ github.run_id }}-${{ github.sha }}
-          path: pkg
-      - name: List artifact files
-        run: find .
-        working-directory: pkg
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Bundle
+        run: bundle install
+
+      - name: Build binary gem
+        run: bundle exec rake binary[${{ matrix.platform }}]
+
       - name: Install gem
         run: gem install --verbose pkg/*.gem
+
       - name: Run smoke test
-        run: |
-          ruby -r 'libddwaf' -e 'p Datadog::AppSec::WAF::LibDDWAF.ddwaf_get_version'
+        run: ruby -r 'libddwaf' -e 'p Datadog::AppSec::WAF::LibDDWAF.ddwaf_get_version'