libddwaf 1.18.0.0.0-x86_64-linux → 1.21.0.0.1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4b9dc918f767d7f4320f1028abe05bf12694598a1c2d79855310f57e757c204
-  data.tar.gz: 129101ead82a9771636006ce64e4d9352b5d0746c0dd411adbfdf6164e0c91ed
+  metadata.gz: 05b6de7d132d91e4d78dcccf2f5b9d40663d97940b77b69081fc4550f8ef9ebb
+  data.tar.gz: 3b587523e632e5c290abf7db52a090a99d37668d2271688ed3d58b3417d989ea
 SHA512:
-  metadata.gz: da26d9ea842942b28de110f04fcbce3d8b16acd068083736df070313aa122195d72f73c88b6fb5298e3b857c3609a233bf479999e17acc38ebf34da67879e0f4
-  data.tar.gz: b5344119847906e408839017242bf9d8511c9047abe3e0cc5a2b8aa941dee0d0191947f0b1ecbf1b853d1007943ae60d98cbd4dab1188cb2a5236bff4cb0d2df
+  metadata.gz: 64c2036d58f97eaef30ef87d52bbc15e9498be7295608371983f517b16952bf9cac1d48f569d01de775cfb40faca6c4d0ac2ac0b99762550bc35928764b89f82
+  data.tar.gz: ced6a8f411bbaa2320fdc8a9312b30cf8ff0c3bab4776cad4ae04ffebcc66283664a108fd3bbd7403381baa85955a6a50c5efabd674379b8470302e250a0f0ab

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+# 2025-02-20 v.1.18.0.0.1
+
+- Fixed memory-leak in `Datadog::AppSec::WAF::Context#run` when non-empty ephemeral data passed
+
 # 2024-10-29 v.1.15.0.0.0
+
 - Update to libddwaf 1.15.0
 - Changed `Datadog::AppSec::WAF::Context#run` interface to accommodate ephemeral data ([Breaking change](https://github.com/DataDog/libddwaf/blob/master/CHANGELOG.md#v1150-unstable))
 
 # 2023-09-11 v.1.14.0.0.0
+
 - Update to libddwaf 1.14.0
 - Add support for `Float` and `Nil` scalar values when converting from ruby to WAF Object and vice versa.
 

data/lib/datadog/appsec/waf/context.rb

@@ -35,6 +35,7 @@ module Datadog
             LibDDWAF.ddwaf_object_free(retained_obj)
           end
 
+          retained.clear
           LibDDWAF.ddwaf_context_destroy(context_obj)
         end
 
@@ -83,10 +84,13 @@ module Datadog
           [RESULT_CODE[code], result]
         ensure
           LibDDWAF.ddwaf_result_free(result_obj) if result_obj
+          LibDDWAF.ddwaf_object_free(ephemeral_data_obj) if ephemeral_data_obj
         end
 
         private
 
+        # FIXME: Rename into something which reflect that it's impossible to run
+        #        libddwaf on finalized context (closed)
         def validate!
           @valid = true
         end

data/lib/datadog/appsec/waf/lib_ddwaf.rb

@@ -53,7 +53,7 @@ module Datadog
 
             cpu = case os_arch
                   when 'amd64' then 'x86_64'
-                  when 'aarch64' then 'aarch64'
+                  when 'aarch64' then local_os == 'darwin' ? 'arm64' : 'aarch64'
                   else raise Error, "unsupported JRuby os.arch: #{os_arch.inspect}"
                   end
 
@@ -95,7 +95,13 @@ module Datadog
         end
 
         def self.shared_lib_extname
-          Gem::Platform.local.os == 'darwin' ? '.dylib' : '.so'
+          if Gem::Platform.local.os == 'darwin'
+            '.dylib'
+          elsif Gem::Platform.local.os == 'java' && java.lang.System.get_property('os.name').match(/mac/i)
+            '.dylib'
+          else
+            '.so'
+          end
         end
 
         def self.shared_lib_path

data/lib/datadog/appsec/waf/version.rb

@@ -2,8 +2,8 @@ module Datadog
   module AppSec
     module WAF
       module VERSION
-        BASE_STRING = '1.18.0'
-        STRING = "#{BASE_STRING}.0.0"
+        BASE_STRING = '1.21.0'
+        STRING = "#{BASE_STRING}.0.1"
         MINIMUM_RUBY_VERSION = '2.5'
       end
     end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.18.0.0.0
+  version: 1.21.0.0.1
 platform: x86_64-linux
 authors:
 - Datadog, Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -47,13 +46,12 @@ files:
 - lib/datadog/appsec/waf/result.rb
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.18.0-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.21.0-linux-x86_64/lib/libddwaf.so
 homepage: https://github.com/DataDog/libddwaf-rb
 licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Datadog WAF
 test_files: []