libddwaf 1.18.0.0.0-java → 1.21.0.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378692f8ef4f465774ed25cee3fd97a764d29af65dfbcd2ec88df7ce516c2817
-  data.tar.gz: d8a743f2e3e1f7e728a18eb11f5f0cf44d153afc0c616ff2038b9a62e3a57040
+  metadata.gz: 111af3e8e37dda64763ecb3e8eb6eb02908fd1eb5ca4d4da4bd41c47cb5298a9
+  data.tar.gz: ed95ea7fcdd23ef935bf1bb3b17bb069bddd9eef3a9da4ccafabb5cc1a08ff68
 SHA512:
-  metadata.gz: dea2b7c8a045b6c6cedcbece6337564c80b6cebfc8680e4ff7928e4b6c0c611b554af589c73e86bcc0ec58d5d96a523e64014320620913fbe1d06b5e815b84dc
-  data.tar.gz: f69f34bcf0ef43e795c9e0b94e96bf74352950f843416bf44620745a2ab24a8944307205edb824beeff07dc15b20d8bc37b57b07cf2684cf83b82fce59ea9cc2
+  metadata.gz: 39c93b38e03f703cda384695c5845886bafb39efc5094c1d5a41f8b56fb98ba71bb36852fb5363104dc035ca27f84c9be51ae0832290aeaef362ae9fed95efcb
+  data.tar.gz: '0682a106250408375b2ec1b976e1a1a1f610b6f6a9f8f4d21ea49279ffde278aff596671c6e8b8a5ca963835b2922642004bf5c29dd8c92d69d53e664826ad04'

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: java
 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,16 +46,15 @@ files:
 - lib/datadog/appsec/waf/result.rb
 - lib/datadog/appsec/waf/version.rb
 - lib/libddwaf.rb
-- vendor/libddwaf/libddwaf-1.18.0-darwin-arm64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.18.0-darwin-x86_64/lib/libddwaf.dylib
-- vendor/libddwaf/libddwaf-1.18.0-linux-aarch64/lib/libddwaf.so
-- vendor/libddwaf/libddwaf-1.18.0-linux-x86_64/lib/libddwaf.so
+- vendor/libddwaf/libddwaf-1.21.0-darwin-arm64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.21.0-darwin-x86_64/lib/libddwaf.dylib
+- vendor/libddwaf/libddwaf-1.21.0-linux-aarch64/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
@@ -71,8 +69,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: []