libddwaf update 1.24.1

.github/workflows/actions.yml

@@ -11,7 +11,7 @@ defaults:
 env:
   buildType: RelWithDebInfo
   tempdir: ${{ github.workspace }}/build
-  libddwafVersion: 1.22.0
+  libddwafVersion: 1.24.1
 jobs:
   Spotless:
     name: spotless

build.gradle

@@ -36,7 +36,7 @@ repositories {
 }
 
 group 'io.sqreen'
-version '13.0.1'
+version '14.0.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -518,7 +518,7 @@ tasks.withType(Test).configureEach {
         it.jvmArgs += ['-Xcheck:jni']
     }
 
-    it.jvmArgs += ['-Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG', '-DPOWERWAF_EXIT_ON_LEAK=true']
+    it.jvmArgs += ['-Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG', '-DDD_APPSEC_DDWAF_EXIT_ON_LEAK=true']
     it.jvmArgs += ['-DuseReleaseBinaries=true']
     it.dependsOn copyNativeLibs
 
@@ -584,7 +584,7 @@ pitest {
     junit5PluginVersion = '1.2.1'
     targetClasses = ['io.sqreen.*']
     def javaLibPath = WINDOWS ? "$cmakeNativeLibDir\\Debug" : "$cmakeNativeLibDir"
-    jvmArgs = ['-Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG', '-DPOWERWAF_EXIT_ON_LEAK=true', "-Djava.library.path=$javaLibPath"]
+    jvmArgs = ['-Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG', '-DDD_APPSEC_DDWAF_EXIT_ON_LEAK=true', "-Djava.library.path=$javaLibPath"]
     threads = 8
     outputFormats = ['HTML']
     mutators = ['STRONGER']

src/jmh/java/com/datadog/ddwaf/WafHandleRunRulesBenchmark.java

@@ -29,7 +29,9 @@ public class WafHandleRunRulesBenchmark {
 
   private static final int OP_COUNT = 1024;
 
-  private WafHandle ctx;
+  private WafBuilder builder;
+  private WafHandle handle;
+  private WafContext context;
   private Waf.Limits limits;
   private Map<String, Object> simplePayload;
 
@@ -50,8 +52,10 @@ public void setup() throws Exception {
     rules.put("events", Collections.singleton(rule));
 
     WafConfig cfg = new WafConfig();
-    ctx = new WafHandle("test", cfg, rules);
-
+    builder = new WafBuilder(cfg);
+    builder.addOrUpdateConfig("test-rules", rules);
+    handle = builder.buildWafHandleInstance();
+    context = new WafContext(handle);
     limits = new Waf.Limits(5, 20, 100, 200000, 0);
 
     simplePayload =
@@ -61,22 +65,24 @@ public void setup() throws Exception {
 
   @TearDown(Level.Iteration)
   public void teardown() {
-    ctx.close();
+    context.close();
+    handle.close();
+    builder.close();
   }
 
   @Benchmark
   @OperationsPerInvocation(OP_COUNT)
   public void empty(final Blackhole bh) throws Exception {
     for (int i = 0; i < OP_COUNT; i++) {
-      bh.consume(ctx.runRules(Collections.emptyMap(), limits, null));
+      bh.consume(context.run(Collections.emptyMap(), limits, null));
     }
   }
 
   @Benchmark
   @OperationsPerInvocation(OP_COUNT)
   public void small(final Blackhole bh) throws Exception {
     for (int i = 0; i < OP_COUNT; i++) {
-      bh.consume(ctx.runRules(simplePayload, limits, null));
+      bh.consume(context.run(simplePayload, limits, null));
     }
   }
 }